meson: add option for tracing; align messages

This commit is contained in:
Moses Turner 2021-09-27 22:47:06 -05:00 committed by Jakob Bornecrantz
parent d61a695f13
commit 1c99e8edb5
3 changed files with 37 additions and 24 deletions

View file

@ -37,6 +37,7 @@ add_project_arguments(cpp.get_supported_arguments([
# #
build_tracking = false build_tracking = false
build_tracing = false
v4l2_required = false v4l2_required = false
hidapi_required = false hidapi_required = false
@ -104,6 +105,12 @@ if get_option('tracking').enabled() or get_option('tracking').auto()
build_tracking = opencv.found() build_tracking = opencv.found()
endif endif
if get_option('tracing')
build_tracing = percetto.found()
endif
# TODO: make these behave well when not present # TODO: make these behave well when not present
x11 = dependency('x11', required: get_option('xlib')) x11 = dependency('x11', required: get_option('xlib'))
x11_xcb = dependency('x11-xcb', required: get_option('xlib')) x11_xcb = dependency('x11-xcb', required: get_option('xlib'))
@ -298,15 +305,21 @@ message('Configuration done!')
message(' drivers: ' + ', '.join(drivers)) message(' drivers: ' + ', '.join(drivers))
if build_docs if build_docs
message(' docs: yes') message(' docs: yes')
else else
message(' docs: no') message(' docs: no')
endif endif
if build_tracking if build_tracking
message(' tracking: yes') message(' tracking: yes')
else else
message(' tracking: no') message(' tracking: no')
endif
if build_tracing
message(' tracing: yes')
else
message(' tracing: no')
endif endif
if get_option('steamvr_plugin') if get_option('steamvr_plugin')
@ -316,39 +329,39 @@ else
endif endif
if build_opengl if build_opengl
message(' opengl: yes') message(' opengl: yes')
else else
message(' opengl: no') message(' opengl: no')
endif endif
if build_opengles if build_opengles
message(' opengles: yes') message(' opengles: yes')
else else
message(' opengles: no') message(' opengles: no')
endif endif
if build_egl if build_egl
message(' egl: yes') message(' egl: yes')
else else
message(' egl: no') message(' egl: no')
endif endif
if build_xlib if build_xlib
message(' xlib: yes') message(' xlib: yes')
else else
message(' xlib: no') message(' xlib: no')
endif endif
if build_xcb if build_xcb
message(' xcb: yes') message(' xcb: yes')
else else
message(' xcb: no') message(' xcb: no')
endif endif
if build_wayland if build_wayland
message(' wayland: yes') message(' wayland: yes')
else else
message(' wayland: no') message(' wayland: no')
endif endif
if build_wayland_direct if build_wayland_direct
@ -358,19 +371,19 @@ else
endif endif
if not get_option('systemd').disabled() and systemd.found() if not get_option('systemd').disabled() and systemd.found()
message(' systemd: yes') message(' systemd: yes')
else else
message(' systemd: no') message(' systemd: no')
endif endif
if not get_option('dbus').disabled() and dbus.found() if not get_option('dbus').disabled() and dbus.found()
message(' dbus: yes') message(' dbus: yes')
else else
message(' dbus: no') message(' dbus: no')
endif endif
if not get_option('libbsd').disabled() and libbsd.found() if not get_option('libbsd').disabled() and libbsd.found()
message(' libbsd: yes') message(' libbsd: yes')
else else
message(' libbsd: no') message(' libbsd: no')
endif endif

View file

@ -16,7 +16,7 @@ if libbsd.found() and not get_option('libbsd').disabled()
aux_util_deps += libbsd aux_util_deps += libbsd
endif endif
if percetto.found() if build_tracing
aux_util_deps += percetto aux_util_deps += percetto
endif endif

View file

@ -119,7 +119,7 @@ if build_wayland_direct
have_conf.set('XRT_HAVE_WAYLAND_DIRECT', true) have_conf.set('XRT_HAVE_WAYLAND_DIRECT', true)
endif endif
if percetto.found() if build_tracing
have_conf.set('XRT_HAVE_PERCETTO', true) have_conf.set('XRT_HAVE_PERCETTO', true)
endif endif