From 062dec59b7be32a2b4174d9c31d7969eed86c85b Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Tue, 7 Mar 2023 13:05:36 +0000
Subject: [PATCH] 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
---
 CMakeLists.txt                                  | 11 +++++++----
 src/xrt/include/xrt/xrt_config_build.h.cmake_in | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4aa0cd276..0817a9940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,11 +267,11 @@ option_with_deps(XRT_FEATURE_RENDERDOC "Enable RenderDoc API" DEPENDS "RT_LIBRAR
 option_with_deps(XRT_FEATURE_SERVICE "Enable separate service module for OpenXR runtime" DEPENDS XRT_MODULE_IPC XRT_FEATURE_OPENXR)
 option_with_deps(XRT_FEATURE_SERVICE_SYSTEMD "Enable systemd socket activation of the service" DEPENDS XRT_HAVE_SYSTEMD XRT_FEATURE_SERVICE)
 option_with_deps(XRT_FEATURE_SLAM "Enable SLAM tracking support" DEPENDS XRT_HAVE_OPENCV "XRT_HAVE_BASALT_SLAM OR XRT_HAVE_KIMERA_SLAM")
+option(XRT_FEATURE_SSE2 "Build using SSE2 instructions, if building for 32-bit x86" ON)
 option_with_deps(XRT_FEATURE_STEAMVR_PLUGIN "Build SteamVR plugin" DEPENDS "NOT ANDROID")
 option_with_deps(XRT_FEATURE_TRACING "Enable debug tracing on supported platforms" DEFAULT OFF DEPENDS "XRT_HAVE_PERCETTO OR XRT_HAVE_TRACY")
 option_with_deps(XRT_FEATURE_WINDOW_PEEK "Enable a window that displays the content of the HMD on screen" DEPENDS XRT_HAVE_SDL2)
 option_with_deps(XRT_FEATURE_DEBUG_GUI "Enable debug window to be used" DEPENDS XRT_HAVE_SDL2)
-option(XRT_FEATURE_SSE2 "Build using SSE2 instructions, if building for 32-bit x86" ON)
 
 if (XRT_FEATURE_SERVICE)
 	# Disable the client debug gui by default for out-of-proc -
@@ -506,7 +506,6 @@ message(STATUS "#    OPENGL_GLX:      ${XRT_HAVE_OPENGL_GLX}")
 message(STATUS "#    PERCETTO:        ${XRT_HAVE_PERCETTO}")
 message(STATUS "#    REALSENSE:       ${XRT_HAVE_REALSENSE}")
 message(STATUS "#    SDL2:            ${XRT_HAVE_SDL2}")
-message(STATUS "#    SLAM:            ${XRT_FEATURE_SLAM}")
 message(STATUS "#    SYSTEM_CJSON:    ${XRT_HAVE_SYSTEM_CJSON}")
 message(STATUS "#    SYSTEMD:         ${XRT_HAVE_SYSTEMD}")
 message(STATUS "#    TRACY:           ${XRT_HAVE_TRACY}")
@@ -529,8 +528,8 @@ message(STATUS "#")
 message(STATUS "#    FEATURE_CLIENT_DEBUG_GUI:             ${XRT_FEATURE_CLIENT_DEBUG_GUI}")
 message(STATUS "#    FEATURE_COLOR_LOG:                    ${XRT_FEATURE_COLOR_LOG}")
 message(STATUS "#    FEATURE_DEBUG_GUI:                    ${XRT_FEATURE_DEBUG_GUI}")
-message(STATUS "#    FEATURE_MERCURY_HANDTRACKING:         ${XRT_MODULE_MERCURY_HANDTRACKING}")
 message(STATUS "#    FEATURE_OPENXR:                       ${XRT_FEATURE_OPENXR}")
+message(STATUS "#    FEATURE_OPENXR_DEBUG_UTILS:           ${XRT_FEATURE_OPENXR_DEBUG_UTILS}")
 message(STATUS "#    FEATURE_OPENXR_LAYER_CUBE:            ${XRT_FEATURE_OPENXR_LAYER_CUBE}")
 message(STATUS "#    FEATURE_OPENXR_LAYER_CYLINDER:        ${XRT_FEATURE_OPENXR_LAYER_CYLINDER}")
 message(STATUS "#    FEATURE_OPENXR_LAYER_DEPTH:           ${XRT_FEATURE_OPENXR_LAYER_DEPTH}")
@@ -538,8 +537,12 @@ message(STATUS "#    FEATURE_OPENXR_LAYER_EQUIRECT1:       ${XRT_FEATURE_OPENXR_
 message(STATUS "#    FEATURE_OPENXR_LAYER_EQUIRECT2:       ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT2}")
 message(STATUS "#    FEATURE_RENDERDOC:                    ${XRT_FEATURE_RENDERDOC}")
 message(STATUS "#    FEATURE_SERVICE:                      ${XRT_FEATURE_SERVICE}")
+message(STATUS "#    FEATURE_SERVICE_SYSTEMD:              ${XRT_FEATURE_SERVICE_SYSTEMD}")
+message(STATUS "#    FEATURE_SLAM:                         ${XRT_FEATURE_SLAM}")
+message(STATUS "#    FEATURE_SSE2:                         ${XRT_FEATURE_SSE2}")
 message(STATUS "#    FEATURE_STEAMVR_PLUGIN:               ${XRT_FEATURE_STEAMVR_PLUGIN}")
 message(STATUS "#    FEATURE_TRACING:                      ${XRT_FEATURE_TRACING}")
+message(STATUS "#    FEATURE_WINDOW_PEEK:                  ${XRT_FEATURE_WINDOW_PEEK}")
 message(STATUS "#")
 message(STATUS "#    DRIVER_ANDROID:      ${XRT_BUILD_DRIVER_ANDROID}")
 message(STATUS "#    DRIVER_ARDUINO:      ${XRT_BUILD_DRIVER_ARDUINO}")
@@ -561,8 +564,8 @@ message(STATUS "#    DRIVER_REMOTE:       ${XRT_BUILD_DRIVER_REMOTE}")
 message(STATUS "#    DRIVER_RIFT_S:       ${XRT_BUILD_DRIVER_RIFT_S}")
 message(STATUS "#    DRIVER_SIMULATED:    ${XRT_BUILD_DRIVER_SIMULATED}")
 message(STATUS "#    DRIVER_SIMULAVR:     ${XRT_BUILD_DRIVER_SIMULAVR}")
-message(STATUS "#    DRIVER_TWRAP:        ${XRT_BUILD_DRIVER_TWRAP}")
 message(STATUS "#    DRIVER_SURVIVE:      ${XRT_BUILD_DRIVER_SURVIVE}")
+message(STATUS "#    DRIVER_TWRAP:        ${XRT_BUILD_DRIVER_TWRAP}")
 message(STATUS "#    DRIVER_ULV2:         ${XRT_BUILD_DRIVER_ULV2}")
 message(STATUS "#    DRIVER_VF:           ${XRT_BUILD_DRIVER_VF}")
 message(STATUS "#    DRIVER_VIVE:         ${XRT_BUILD_DRIVER_VIVE}")
diff --git a/src/xrt/include/xrt/xrt_config_build.h.cmake_in b/src/xrt/include/xrt/xrt_config_build.h.cmake_in
index 4d7811aef..264da8375 100644
--- a/src/xrt/include/xrt/xrt_config_build.h.cmake_in
+++ b/src/xrt/include/xrt/xrt_config_build.h.cmake_in
@@ -12,14 +12,19 @@
 
 /* keep sorted */
 
-#cmakedefine XRT_MODULE_IPC
+#cmakedefine XRT_MODULE_AUX_VIVE
 #cmakedefine XRT_MODULE_COMPOSITOR
 #cmakedefine XRT_MODULE_COMPOSITOR_MAIN
 #cmakedefine XRT_MODULE_COMPOSITOR_NULL
+#cmakedefine XRT_MODULE_MERCURY_HANDTRACKING
+#cmakedefine XRT_MODULE_IPC
+#cmakedefine XRT_MODULE_MONADO_GUI
+#cmakedefine XRT_MODULE_MONADO_CLI
 
 
 /* keep sorted */
 
+#cmakedefine XRT_FEATURE_CLIENT_DEBUG_GUI
 #cmakedefine XRT_FEATURE_COLOR_LOG
 #cmakedefine XRT_FEATURE_DEBUG_GUI
 #cmakedefine XRT_FEATURE_OPENXR
@@ -31,9 +36,15 @@
 #cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT2
 #cmakedefine XRT_FEATURE_RENDERDOC
 #cmakedefine XRT_FEATURE_SERVICE
+#cmakedefine XRT_FEATURE_SERVICE_SYSTEMD
 #cmakedefine XRT_FEATURE_SLAM
+#cmakedefine XRT_FEATURE_SSE2
+#cmakedefine XRT_FEATURE_STEAMVR_PLUGIN
 #cmakedefine XRT_FEATURE_TRACING
-#cmakedefine XRT_FEATURE_CLIENT_DEBUG_GUI
 #cmakedefine XRT_FEATURE_WINDOW_PEEK
+
+
+/* keep sorted */
+
 #cmakedefine XRT_IPC_MSG_SOCK_FILENAME "@XRT_IPC_MSG_SOCK_FILENAME@"
 #cmakedefine XRT_IPC_SERVICE_PID_FILENAME "@XRT_IPC_SERVICE_PID_FILENAME@"