The open source OpenXR runtime
cmake: Sort print list and general tidy [NFC]
* Sort lists
* Add all entries to exposed cmakedefines list
* Remove duplicate hand-tracking entry
* Move SLAM entry to feature list as it's called feature
+20
-6
+7
-4
CMakeLists.txt
+7
-4
CMakeLists.txt
···
267
267
option_with_deps(XRT_FEATURE_SERVICE "Enable separate service module for OpenXR runtime" DEPENDS XRT_MODULE_IPC XRT_FEATURE_OPENXR)
268
268
option_with_deps(XRT_FEATURE_SERVICE_SYSTEMD "Enable systemd socket activation of the service" DEPENDS XRT_HAVE_SYSTEMD XRT_FEATURE_SERVICE)
269
269
option_with_deps(XRT_FEATURE_SLAM "Enable SLAM tracking support" DEPENDS XRT_HAVE_OPENCV "XRT_HAVE_BASALT_SLAM OR XRT_HAVE_KIMERA_SLAM")
270
+
option(XRT_FEATURE_SSE2 "Build using SSE2 instructions, if building for 32-bit x86" ON)
270
271
option_with_deps(XRT_FEATURE_STEAMVR_PLUGIN "Build SteamVR plugin" DEPENDS "NOT ANDROID")
271
272
option_with_deps(XRT_FEATURE_TRACING "Enable debug tracing on supported platforms" DEFAULT OFF DEPENDS "XRT_HAVE_PERCETTO OR XRT_HAVE_TRACY")
272
273
option_with_deps(XRT_FEATURE_WINDOW_PEEK "Enable a window that displays the content of the HMD on screen" DEPENDS XRT_HAVE_SDL2)
273
274
option_with_deps(XRT_FEATURE_DEBUG_GUI "Enable debug window to be used" DEPENDS XRT_HAVE_SDL2)
274
-
option(XRT_FEATURE_SSE2 "Build using SSE2 instructions, if building for 32-bit x86" ON)
275
275
276
276
if (XRT_FEATURE_SERVICE)
277
277
# Disable the client debug gui by default for out-of-proc -
···
506
506
message(STATUS "# PERCETTO: ${XRT_HAVE_PERCETTO}")
507
507
message(STATUS "# REALSENSE: ${XRT_HAVE_REALSENSE}")
508
508
message(STATUS "# SDL2: ${XRT_HAVE_SDL2}")
509
-
message(STATUS "# SLAM: ${XRT_FEATURE_SLAM}")
510
509
message(STATUS "# SYSTEM_CJSON: ${XRT_HAVE_SYSTEM_CJSON}")
511
510
message(STATUS "# SYSTEMD: ${XRT_HAVE_SYSTEMD}")
512
511
message(STATUS "# TRACY: ${XRT_HAVE_TRACY}")
···
529
528
message(STATUS "# FEATURE_CLIENT_DEBUG_GUI: ${XRT_FEATURE_CLIENT_DEBUG_GUI}")
530
529
message(STATUS "# FEATURE_COLOR_LOG: ${XRT_FEATURE_COLOR_LOG}")
531
530
message(STATUS "# FEATURE_DEBUG_GUI: ${XRT_FEATURE_DEBUG_GUI}")
532
-
message(STATUS "# FEATURE_MERCURY_HANDTRACKING: ${XRT_MODULE_MERCURY_HANDTRACKING}")
533
531
message(STATUS "# FEATURE_OPENXR: ${XRT_FEATURE_OPENXR}")
532
+
message(STATUS "# FEATURE_OPENXR_DEBUG_UTILS: ${XRT_FEATURE_OPENXR_DEBUG_UTILS}")
534
533
message(STATUS "# FEATURE_OPENXR_LAYER_CUBE: ${XRT_FEATURE_OPENXR_LAYER_CUBE}")
535
534
message(STATUS "# FEATURE_OPENXR_LAYER_CYLINDER: ${XRT_FEATURE_OPENXR_LAYER_CYLINDER}")
536
535
message(STATUS "# FEATURE_OPENXR_LAYER_DEPTH: ${XRT_FEATURE_OPENXR_LAYER_DEPTH}")
···
538
537
message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT2: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT2}")
539
538
message(STATUS "# FEATURE_RENDERDOC: ${XRT_FEATURE_RENDERDOC}")
540
539
message(STATUS "# FEATURE_SERVICE: ${XRT_FEATURE_SERVICE}")
540
+
message(STATUS "# FEATURE_SERVICE_SYSTEMD: ${XRT_FEATURE_SERVICE_SYSTEMD}")
541
+
message(STATUS "# FEATURE_SLAM: ${XRT_FEATURE_SLAM}")
542
+
message(STATUS "# FEATURE_SSE2: ${XRT_FEATURE_SSE2}")
541
543
message(STATUS "# FEATURE_STEAMVR_PLUGIN: ${XRT_FEATURE_STEAMVR_PLUGIN}")
542
544
message(STATUS "# FEATURE_TRACING: ${XRT_FEATURE_TRACING}")
545
+
message(STATUS "# FEATURE_WINDOW_PEEK: ${XRT_FEATURE_WINDOW_PEEK}")
543
546
message(STATUS "#")
544
547
message(STATUS "# DRIVER_ANDROID: ${XRT_BUILD_DRIVER_ANDROID}")
545
548
message(STATUS "# DRIVER_ARDUINO: ${XRT_BUILD_DRIVER_ARDUINO}")
···
561
564
message(STATUS "# DRIVER_RIFT_S: ${XRT_BUILD_DRIVER_RIFT_S}")
562
565
message(STATUS "# DRIVER_SIMULATED: ${XRT_BUILD_DRIVER_SIMULATED}")
563
566
message(STATUS "# DRIVER_SIMULAVR: ${XRT_BUILD_DRIVER_SIMULAVR}")
564
-
message(STATUS "# DRIVER_TWRAP: ${XRT_BUILD_DRIVER_TWRAP}")
565
567
message(STATUS "# DRIVER_SURVIVE: ${XRT_BUILD_DRIVER_SURVIVE}")
568
+
message(STATUS "# DRIVER_TWRAP: ${XRT_BUILD_DRIVER_TWRAP}")
566
569
message(STATUS "# DRIVER_ULV2: ${XRT_BUILD_DRIVER_ULV2}")
567
570
message(STATUS "# DRIVER_VF: ${XRT_BUILD_DRIVER_VF}")
568
571
message(STATUS "# DRIVER_VIVE: ${XRT_BUILD_DRIVER_VIVE}")
+13
-2
src/xrt/include/xrt/xrt_config_build.h.cmake_in
+13
-2
src/xrt/include/xrt/xrt_config_build.h.cmake_in
···
12
12
13
13
/* keep sorted */
14
14
15
-
#cmakedefine XRT_MODULE_IPC
15
+
#cmakedefine XRT_MODULE_AUX_VIVE
16
16
#cmakedefine XRT_MODULE_COMPOSITOR
17
17
#cmakedefine XRT_MODULE_COMPOSITOR_MAIN
18
18
#cmakedefine XRT_MODULE_COMPOSITOR_NULL
19
+
#cmakedefine XRT_MODULE_MERCURY_HANDTRACKING
20
+
#cmakedefine XRT_MODULE_IPC
21
+
#cmakedefine XRT_MODULE_MONADO_GUI
22
+
#cmakedefine XRT_MODULE_MONADO_CLI
19
23
20
24
21
25
/* keep sorted */
22
26
27
+
#cmakedefine XRT_FEATURE_CLIENT_DEBUG_GUI
23
28
#cmakedefine XRT_FEATURE_COLOR_LOG
24
29
#cmakedefine XRT_FEATURE_DEBUG_GUI
25
30
#cmakedefine XRT_FEATURE_OPENXR
···
31
36
#cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT2
32
37
#cmakedefine XRT_FEATURE_RENDERDOC
33
38
#cmakedefine XRT_FEATURE_SERVICE
39
+
#cmakedefine XRT_FEATURE_SERVICE_SYSTEMD
34
40
#cmakedefine XRT_FEATURE_SLAM
41
+
#cmakedefine XRT_FEATURE_SSE2
42
+
#cmakedefine XRT_FEATURE_STEAMVR_PLUGIN
35
43
#cmakedefine XRT_FEATURE_TRACING
36
-
#cmakedefine XRT_FEATURE_CLIENT_DEBUG_GUI
37
44
#cmakedefine XRT_FEATURE_WINDOW_PEEK
45
+
46
+
47
+
/* keep sorted */
48
+
38
49
#cmakedefine XRT_IPC_MSG_SOCK_FILENAME "@XRT_IPC_MSG_SOCK_FILENAME@"
39
50
#cmakedefine XRT_IPC_SERVICE_PID_FILENAME "@XRT_IPC_SERVICE_PID_FILENAME@"