matrixfurry.com / monado
The open source OpenXR runtime
fork atom

cmake: fix custom openxr target builds

MR.2401 made a change where the state_tracker directory
is now conditionally recursed into only if the main
openxr feature is enabled, this breaks derived runtimes
which have custom openxr/serivce/service-lib targets
that depend on the oxr target.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2422>

Korcan Hussein 0d0e3704 e79258f4

+5 -3
+3 -1
CMakeLists.txt
··· 259 259 option(XRT_MODULE_MONADO_CLI "Build monado-cli" ON) 260 260 option_with_deps(XRT_MODULE_MONADO_GUI "Build monado-gui" DEPENDS XRT_HAVE_SDL2) 261 261 option(XRT_MODULE_AUX_VIVE "Build aux_vive" ON) 262 + option(XRT_MODULE_OPENXR_STATE_TRACKER "Build OpenXR State Tracker" ON) 262 263 263 264 # Feature configuration (sorted) 264 265 option_with_deps(XRT_FEATURE_AHARDWARE_BUFFER "Enable AHardwareBuffer for XrSwapchain images on Android (API-level 26+) platforms" DEPENDS ANDROID) 265 266 option_with_deps(XRT_FEATURE_COLOR_LOG "Enable logging in color on supported platforms" DEPENDS XRT_HAVE_LINUX) 266 - option_with_deps(XRT_FEATURE_OPENXR "Build OpenXR runtime target" DEPENDS "XRT_MODULE_COMPOSITOR_MAIN OR XRT_MODULE_COMPOSITOR_NULL") 267 + option_with_deps(XRT_FEATURE_OPENXR "Build OpenXR runtime target" DEPENDS XRT_MODULE_OPENXR_STATE_TRACKER "XRT_MODULE_COMPOSITOR_MAIN OR XRT_MODULE_COMPOSITOR_NULL") 267 268 set(XRT_FEATURE_OPENXR_DEBUG_UTILS OFF) # Has never been enabled 268 269 option_with_deps(XRT_FEATURE_RENDERDOC "Enable RenderDoc API" DEPENDS "RT_LIBRARY OR WIN32 OR ANDROID") 269 270 option_with_deps(XRT_FEATURE_SERVICE "Enable separate service module for OpenXR runtime" DEPENDS XRT_MODULE_IPC XRT_FEATURE_OPENXR) ··· 583 584 message(STATUS "# MODULE_IPC: ${XRT_MODULE_IPC}") 584 585 message(STATUS "# MODULE_MONADO_GUI: ${XRT_MODULE_MONADO_GUI}") 585 586 message(STATUS "# MODULE_MONADO_CLI: ${XRT_MODULE_MONADO_CLI}") 587 + message(STATUS "# MODULE_OPENXR_STATE_TRACKER: ${XRT_MODULE_OPENXR_STATE_TRACKER}") 586 588 message(STATUS "#") 587 589 message(STATUS "# FEATURE_AHARDWARE_BUFFER: ${XRT_FEATURE_AHARDWARE_BUFFER}") 588 590 message(STATUS "# FEATURE_CLIENT_DEBUG_GUI: ${XRT_FEATURE_CLIENT_DEBUG_GUI}")
+1 -1
src/xrt/state_trackers/CMakeLists.txt
··· 5 5 add_subdirectory(gui) 6 6 endif() 7 7 8 - if(XRT_FEATURE_OPENXR) 8 + if(XRT_MODULE_OPENXR_STATE_TRACKER) 9 9 add_subdirectory(oxr) 10 10 endif() 11 11
+1 -1
src/xrt/state_trackers/oxr/CMakeLists.txt
··· 57 57 58 58 if(XRT_HAVE_VULKAN) 59 59 target_sources(st_oxr PRIVATE oxr_session_gfx_vk.c oxr_swapchain_vk.c oxr_vulkan.c) 60 - target_link_libraries(st_oxr PUBLIC Vulkan::Vulkan) 60 + target_link_libraries(st_oxr PUBLIC aux_vk) 61 61 endif() 62 62 63 63 if(XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES)