cmake: remove XRT_HAVE_BASALT & XRT_HAVE_KIMERA · matrixfurry.com/monado@170d389

+2 -24

CMakeLists.txt

··· 179 179 pkg_check_modules(SURVIVE IMPORTED_TARGET survive) 180 180 endif() 181 181 182 - # Find a external SLAM implementation 183 - set(EXTERNAL_SLAM_SYSTEMS kimera_vio basalt) 184 - foreach(slam_system IN LISTS EXTERNAL_SLAM_SYSTEMS) 185 - if(PKGCONFIG_FOUND) 186 - pkg_check_modules(${slam_system} ${slam_system}) 187 - endif() 188 - if(${slam_system}_FOUND) 189 - set(SLAM_NAME ${slam_system}) 190 - set(SLAM_LDFLAGS ${${slam_system}_LDFLAGS}) 191 - set(SLAM_LIBRARIES ${${slam_system}_LIBRARIES}) 192 - set(SLAM_INCLUDE_DIRS ${${slam_system}_INCLUDE_DIRS}) 193 - # Exit after the first we find. 194 - break() 195 - endif() 196 - endforeach() 197 - 198 182 # Find openvr library 199 183 find_library(OPENVR_LIBRARIES NAMES openvr_api) 200 184 if(OPENVR_LIBRARIES) ··· 249 233 option_with_deps(XRT_HAVE_XRANDR "Enable xlib-xrandr support" DEPENDS XRANDR_FOUND) 250 234 251 235 # System deps to use (sorted) 236 + option_with_deps(XRT_HAVE_OPENCV "Enable OpenCV backend" DEPENDS OpenCV_FOUND) 252 237 option_with_deps(XRT_HAVE_DBUS "Enable dbus support (for BLE support)" DEPENDS DBUS_FOUND) 253 238 option_with_deps(XRT_HAVE_LIBBSD "Enable libbsd support" DEPENDS LIBBSD_FOUND) 254 239 option_with_deps(XRT_HAVE_LIBUDEV "Enable libudev (used for device probing on Linux)" DEPENDS UDEV_FOUND) ··· 257 242 258 243 # Only use system cJSON if it includes https://github.com/DaveGamble/cJSON/pull/377 259 244 option_with_deps(XRT_HAVE_SYSTEM_CJSON "Enable cJSON from system, instead of bundled source" DEPENDS CJSON_FOUND "cJSON_VERSION VERSION_GREATER_EQUAL 1.7.13") 260 - 261 - # SLAM backends and deps (sorted) 262 - option_with_deps(XRT_HAVE_OPENCV "Enable OpenCV backend" DEPENDS OpenCV_FOUND) 263 - option_with_deps(XRT_HAVE_BASALT "Enable Basalt support" DEPENDS basalt_FOUND) 264 - option_with_deps(XRT_HAVE_KIMERA "Enable Kimera support" DEPENDS kimera_vio_FOUND) 265 245 266 246 # Hand tracking deps 267 247 option_with_deps(XRT_HAVE_ONNXRUNTIME "Enable ONNX runtime support" DEPENDS ONNXRUNTIME_FOUND) ··· 287 267 option_with_deps(XRT_FEATURE_RENDERDOC "Enable RenderDoc API" DEPENDS "RT_LIBRARY OR WIN32 OR ANDROID") 288 268 option_with_deps(XRT_FEATURE_SERVICE "Enable separate service module for OpenXR runtime" DEPENDS XRT_MODULE_IPC XRT_FEATURE_OPENXR) 289 269 option_with_deps(XRT_FEATURE_SERVICE_SYSTEMD "Enable systemd socket activation of the service" DEPENDS XRT_HAVE_SYSTEMD XRT_FEATURE_SERVICE) 290 - option_with_deps(XRT_FEATURE_SLAM "Enable SLAM tracking support" DEPENDS XRT_HAVE_OPENCV "XRT_HAVE_BASALT OR XRT_HAVE_KIMERA") 270 + option_with_deps(XRT_FEATURE_SLAM "Enable SLAM tracking support" DEPENDS XRT_HAVE_OPENCV) 291 271 option(XRT_FEATURE_SSE2 "Build using SSE2 instructions, if building for 32-bit x86" ON) 292 272 option_with_deps(XRT_FEATURE_STEAMVR_PLUGIN "Build SteamVR plugin" DEPENDS "NOT ANDROID") 293 273 option_with_deps(XRT_FEATURE_TRACING "Enable debug tracing on supported platforms" DEFAULT OFF DEPENDS "XRT_HAVE_PERCETTO OR XRT_HAVE_TRACY") ··· 587 567 message(STATUS "#####----- Config -----#####") 588 568 message(STATUS "# GIT_DESC: ${GIT_DESC}") 589 569 message(STATUS "#") 590 - message(STATUS "# BASALT: ${XRT_HAVE_BASALT}") 591 570 message(STATUS "# BLUETOOTH: ${XRT_HAVE_BLUETOOTH}") 592 571 message(STATUS "# D3D11: ${XRT_HAVE_D3D11}") 593 572 message(STATUS "# D3D12: ${XRT_HAVE_D3D12}") ··· 596 575 message(STATUS "# GST (GStreamer): ${XRT_HAVE_GST}") 597 576 message(STATUS "# HIDAPI: ${XRT_HAVE_HIDAPI}") 598 577 message(STATUS "# JPEG: ${XRT_HAVE_JPEG}") 599 - message(STATUS "# KIMERA: ${XRT_HAVE_KIMERA}") 600 578 message(STATUS "# LIBBSD: ${XRT_HAVE_LIBBSD}") 601 579 message(STATUS "# LIBUSB: ${XRT_HAVE_LIBUSB}") 602 580 message(STATUS "# LIBUVC: ${XRT_HAVE_LIBUVC}")

-2

scripts/mapping.imp

··· 62 62 { symbol: ["XRT_FEATURE_WINDOW_PEEK", "public", "\"xrt/xrt_config_build.h\"", "public"] }, 63 63 { symbol: ["XRT_IPC_MSG_SOCK_FILENAME", "public", "\"xrt/xrt_config_build.h\"", "public"] }, 64 64 { symbol: ["XRT_IPC_SERVICE_PID_FILENAME", "public", "\"xrt/xrt_config_build.h\"", "public"] }, 65 - { symbol: ["XRT_HAVE_BASALT", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 66 65 { symbol: ["XRT_HAVE_BLUETOOTH", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 67 66 { symbol: ["XRT_HAVE_D3D11", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 68 67 { symbol: ["XRT_HAVE_D3D12", "public", "\"xrt/xrt_config_have.h\"", "public"] }, ··· 72 71 { symbol: ["XRT_HAVE_GST", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 73 72 { symbol: ["XRT_HAVE_HIDAPI", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 74 73 { symbol: ["XRT_HAVE_JPEG", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 75 - { symbol: ["XRT_HAVE_KIMERA", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 76 74 { symbol: ["XRT_HAVE_LIBBSD", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 77 75 { symbol: ["XRT_HAVE_LIBUDEV", "public", "\"xrt/xrt_config_have.h\"", "public"] }, 78 76 { symbol: ["XRT_HAVE_LIBUSB", "public", "\"xrt/xrt_config_have.h\"", "public"] },

-2

src/xrt/include/xrt/xrt_config_have.h.cmake_in

··· 11 11 12 12 /* keep sorted */ 13 13 14 - #cmakedefine XRT_HAVE_BASALT 15 14 #cmakedefine XRT_HAVE_BLUETOOTH 16 15 #cmakedefine XRT_HAVE_D3D11 17 16 #cmakedefine XRT_HAVE_D3D12 ··· 21 20 #cmakedefine XRT_HAVE_GST 22 21 #cmakedefine XRT_HAVE_HIDAPI 23 22 #cmakedefine XRT_HAVE_JPEG 24 - #cmakedefine XRT_HAVE_KIMERA 25 23 #cmakedefine XRT_HAVE_LIBBSD 26 24 #cmakedefine XRT_HAVE_LIBUDEV 27 25 #cmakedefine XRT_HAVE_LIBUSB

Configure Feed

Configure Feed