Reduce extra packages installed during autobuild configure

Signed-off-by: Rye <rye@alchemyviewer.org>

4 files changed, 36 insertions, 34 deletions

diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index d5840379ac..1f12dec1f6 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -1,14 +1,7 @@
 # -*- cmake -*-
+include_guard()
 
 include(Variables)
-include(GLEXT)
 include(Prebuilt)
+include(GLEXT)
 include(SDL3)
-
-include_guard()
-
-if (LINUX)
-  set(USE_SDL_WINDOW ON CACHE BOOL "Build with SDL window backend")
-else()
-  set(USE_SDL_WINDOW OFF CACHE BOOL "Build with SDL window backend")
-endif (LINUX)
diff --git a/indra/cmake/OpenXR.cmake b/indra/cmake/OpenXR.cmake
index 2cc862b927..7cc1be634b 100644
--- a/indra/cmake/OpenXR.cmake
+++ b/indra/cmake/OpenXR.cmake
@@ -5,18 +5,21 @@ include(Prebuilt)
 include_guard()
 add_library( ll::openxr INTERFACE IMPORTED )
 
-if(USE_CONAN )
-  target_link_libraries( ll::openxr INTERFACE CONAN_PKG::openxr )
-  return()
-endif()
+option(USE_OPENXR "Enable building with OpenXR support" OFF)
+if(USE_OPENXR)
+  if(USE_CONAN )
+    target_link_libraries( ll::openxr INTERFACE CONAN_PKG::openxr )
+    return()
+  endif()
 
-use_prebuilt_binary(openxr)
-if (WINDOWS)
-  target_link_libraries( ll::openxr INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/openxr_loader.lib )
-else()
-  target_link_libraries( ll::openxr INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libopenxr_loader.a )
-endif (WINDOWS)
+  use_prebuilt_binary(openxr)
+  if (WINDOWS)
+    target_link_libraries( ll::openxr INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/openxr_loader.lib )
+  else()
+    target_link_libraries( ll::openxr INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libopenxr_loader.a )
+  endif (WINDOWS)
 
-if( NOT LINUX )
-  target_include_directories( ll::openxr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+  if( NOT LINUX )
+    target_include_directories( ll::openxr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+  endif()
 endif()
diff --git a/indra/cmake/SDL3.cmake b/indra/cmake/SDL3.cmake
index b37e1c64c2..fe9012de17 100644
--- a/indra/cmake/SDL3.cmake
+++ b/indra/cmake/SDL3.cmake
@@ -1,19 +1,26 @@
 # -*- cmake -*-
-cmake_minimum_required( VERSION 3.13 FATAL_ERROR )
-
-include(Linking)
-include( Prebuilt )
 include_guard()
+include(Linking)
+include(Prebuilt)
+
+add_library(ll::SDL3 INTERFACE IMPORTED)
+
+if (LINUX)
+  set(USE_SDL_WINDOW ON CACHE BOOL "Build with SDL window backend")
+else()
+  set(USE_SDL_WINDOW OFF CACHE BOOL "Build with SDL window backend")
+endif (LINUX)
 
-add_library( ll::SDL3 INTERFACE IMPORTED )
+if(USE_SDL_WINDOW)
+    use_system_binary(SDL3)
+    use_prebuilt_binary(SDL3)
 
-use_system_binary( SDL3 )
-use_prebuilt_binary( SDL3 )
+    find_library( SDL3_LIBRARY
+        NAMES SDL3 SDL3.lib libSDL3.so libSDL3.dylib
+        PATHS "${LIBS_PREBUILT_DIR}/lib/release" REQUIRED)
 
-find_library( SDL3_LIBRARY
-    NAMES SDL3 SDL3.lib libSDL3.so libSDL3.dylib
-    PATHS "${LIBS_PREBUILT_DIR}/lib/release" REQUIRED)
+    target_link_libraries(ll::SDL3 INTERFACE ${SDL3_LIBRARY})
+    target_include_directories(ll::SDL3 SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/")
 
-target_link_libraries( ll::SDL3 INTERFACE ${SDL3_LIBRARY})
-target_include_directories( ll::SDL3 SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/" )
+endif(USE_SDL_WINDOW)
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 8c39f5f249..c269fa699e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -45,7 +45,6 @@ include(UI)
 include(ViewerMiscLibs)
 include(ViewerManager)
 include(VisualLeakDetector)
-include(VulkanGltf)
 include(ZLIBNG)
 include(LLPrimitive)