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

cmake: Add XRT_MODULE_AUX_VIVE

Moshi Turner ae7167db 85a701a4

+6 -7
unified split
+5 -3
CMakeLists.txt
··· 310 310 option_with_deps(XRT_BUILD_DRIVER_PSVR "Enable PSVR HMD driver" DEPENDS XRT_HAVE_HIDAPI) 311 311 option_with_deps(XRT_BUILD_DRIVER_QWERTY "Enable Qwerty driver" DEPENDS XRT_HAVE_SDL2) 312 312 option_with_deps(XRT_BUILD_DRIVER_REALSENSE "Enable RealSense device driver" DEPENDS XRT_HAVE_REALSENSE) 313 - option_with_deps(XRT_BUILD_DRIVER_REMOTE "Enable remote debugging driver" DEPENDS "XRT_HAVE_LINUX OR ANDROID") 313 + option_with_deps(XRT_BUILD_DRIVER_REMOTE "Enable remote debugging driver" DEPENDS "XRT_HAVE_LINUX OR ANDROID" XRT_MODULE_AUX_VIVE) 314 314 option_with_deps(XRT_BUILD_DRIVER_RIFT_S "Enable Oculus Rift S device driver" DEPENDS XRT_HAVE_HIDAPI XRT_HAVE_V4L2) 315 - option_with_deps(XRT_BUILD_DRIVER_SURVIVE "Enable libsurvive driver" DEPENDS SURVIVE_FOUND) 315 + option_with_deps(XRT_BUILD_DRIVER_SURVIVE "Enable libsurvive driver" DEPENDS SURVIVE_FOUND XRT_MODULE_AUX_VIVE) 316 316 option_with_deps(XRT_BUILD_DRIVER_ULV2 "Enable Ultraleap v2 driver" DEPENDS LeapV2_FOUND) 317 317 option_with_deps(XRT_BUILD_DRIVER_VF "Build video frame driver (for video file support, uses gstreamer)" DEPENDS XRT_HAVE_GST) 318 - option_with_deps(XRT_BUILD_DRIVER_VIVE "Enable driver for HTC Vive, Vive Pro, Valve Index, and their controllers" DEPENDS ZLIB_FOUND XRT_HAVE_LINUX) 318 + option_with_deps(XRT_BUILD_DRIVER_VIVE "Enable driver for HTC Vive, Vive Pro, Valve Index, and their controllers" DEPENDS ZLIB_FOUND XRT_HAVE_LINUX XRT_MODULE_AUX_VIVE) 319 319 option_with_deps(XRT_BUILD_DRIVER_WMR "Enable Windows Mixed Reality driver" DEPENDS "NOT WIN32") 320 320 option_with_deps(XRT_BUILD_DRIVER_SIMULAVR "Enable simula driver" DEPENDS XRT_HAVE_REALSENSE) 321 321 option(XRT_BUILD_DRIVER_SIMULATED "Enable simulated driver" ON) ··· 326 326 set(XRT_OXR_RUNTIME_SUFFIX monado CACHE STRING "OpenXR client library suffix") 327 327 328 328 # cmake-format: on 329 + 330 + option(XRT_MODULE_AUX_VIVE "Build aux_vive" ON) 329 331 330 332 # Most users won't touch these. 331 333 mark_as_advanced(XRT_MODULE_COMPOSITOR_MAIN XRT_MODULE_COMPOSITOR_NULL XRT_FEATURE_OPENXR)
+1 -4
src/xrt/auxiliary/CMakeLists.txt
··· 39 39 add_subdirectory(util) 40 40 41 41 # Vive helper library. 42 - if(XRT_BUILD_DRIVER_VIVE 43 - OR XRT_BUILD_DRIVER_SURVIVE 44 - OR XRT_BUILD_DRIVER_REMOTE 45 - ) 42 + if(XRT_MODULE_AUX_VIVE) 46 43 add_subdirectory(vive) 47 44 endif() 48 45