From 4894aaa8db54baad7031eb0abbf4bbdfb58aa8dc Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 26 Aug 2020 11:27:10 -0500 Subject: [PATCH] build: Only set the layer type config variables if they aren't already set. --- CMakeLists.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e4c17dff..625c2ae6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,10 +97,18 @@ cmake_dependent_option(XRT_FEATURE_SERVICE "Enable separate service module for O cmake_dependent_option(XRT_HAVE_SYSTEMD "Enable systemd support (for socket activation of service)" ON "Systemd_FOUND AND XRT_FEATURE_SERVICE" OFF) cmake_dependent_option(XRT_INSTALL_SYSTEMD_UNIT_FILES "Install user unit files for systemd socket activation on installation" ON "XRT_HAVE_SYSTEMD" OFF) cmake_dependent_option(XRT_INSTALL_ABSOLUTE_SYSTEMD_UNIT_FILES "Use an absolute path to monado-system in installed user unit files for systemd socket activation" ON "XRT_INSTALL_SYSTEMD_UNIT_FILES" OFF) -set(XRT_FEATURE_OPENXR_LAYER_DEPTH ON) -set(XRT_FEATURE_OPENXR_LAYER_CUBE OFF) -set(XRT_FEATURE_OPENXR_LAYER_CYLINDER ON) -set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT OFF) +if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_DEPTH) + set(XRT_FEATURE_OPENXR_LAYER_DEPTH ON) +endif() +if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_CUBE) + set(XRT_FEATURE_OPENXR_LAYER_CUBE OFF) +endif() +if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_CYLINDER) + set(XRT_FEATURE_OPENXR_LAYER_CYLINDER ON) +endif() +if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_EQUIRECT) + set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT OFF) +endif() # Most users won't touch these. mark_as_advanced(XRT_FEATURE_COMPOSITOR_MAIN XRT_FEATURE_OPENXR)