7 files changed, 34 insertions, 30 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index fa3b8a4ffb..58a00c74da 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -8,7 +8,7 @@ add_library( ll::apr INTERFACE IMPORTED )
 if (WINDOWS)
   target_include_directories(ll::apr SYSTEM INTERFACE ${prefix_result}/../include)
   target_link_directories(ll::apr INTERFACE ${prefix_result})
-  target_link_libraries(ll::apr INTERFACE apr-1 apr-util-1)
+  target_link_libraries(ll::apr INTERFACE libapr-1 libaprutil-1)
 else ()
   include(FindPkgConfig)
   pkg_check_modules(Apr REQUIRED apr-1 apr-util-1)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 9ea1f6c9a6..2c4ec193e7 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -4,38 +4,40 @@ include(Prebuilt)
 include_guard()
 
 add_library( ll::boost INTERFACE IMPORTED )
-
-if (DARWIN)
-  target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.87/include)
-  target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.87/lib)
-  set(sfx -mt)
-elseif (WINDOWS)
-  target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include)
-  target_link_directories( ll::boost INTERFACE ${prefix_result})
-  set(sfx -vc143-mt-x64-1_88)
-else ()
-  find_package( Boost REQUIRED )
-endif ()
-target_link_libraries( ll::boost INTERFACE
-  boost_context${sfx}
-  boost_fiber${sfx}
-  boost_filesystem${sfx}
-  boost_program_options${sfx}
-  boost_regex${sfx}
-  boost_system${sfx}
-  boost_thread${sfx}
-  boost_url${sfx}
-  )
-target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )
-return()
-
 if( USE_CONAN )
   target_link_libraries( ll::boost INTERFACE CONAN_PKG::boost )
   target_compile_definitions( ll::boost INTERFACE BOOST_ALLOW_DEPRECATED_HEADERS BOOST_BIND_GLOBAL_PLACEHOLDERS )
   return()
 endif()
 
+if (WINDOWS)
 use_prebuilt_binary(boost)
+  target_include_directories( ll::boost SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+else ()
+  if (DARWIN)
+    target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.87/include)
+    target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.87/lib)
+    set(sfx -mt)
+  elseif (WINDOWS)
+    target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include)
+    target_link_directories( ll::boost INTERFACE ${prefix_result})
+    set(sfx -vc143-mt-x64-1_88)
+  else ()
+    find_package( Boost REQUIRED )
+  endif ()
+  target_link_libraries( ll::boost INTERFACE
+    boost_context${sfx}
+    boost_fiber${sfx}
+    boost_filesystem${sfx}
+    boost_program_options${sfx}
+    boost_regex${sfx}
+    boost_system${sfx}
+    boost_thread${sfx}
+    boost_url${sfx}
+    )
+  target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )
+  return()
+endif ()
 
 # As of sometime between Boost 1.67 and 1.72, Boost libraries are suffixed
 # with the address size.
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 746d242560..5525ac9f24 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -24,6 +24,7 @@ set(cmake_SOURCE_FILES
         FindAutobuild.cmake
         FMODSTUDIO.cmake
         FreeType.cmake
+        GLEXT.cmake
         GLH.cmake
         GLM.cmake
         Havok.cmake
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index a780966f0c..f45b27e7b8 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -3,7 +3,9 @@ include(Prebuilt)
 include(GLH)
 
 add_library( ll::glext INTERFACE IMPORTED )
-use_system_binary(glext)
+#use_system_binary(glext)
+if (WINDOWS)
 use_prebuilt_binary(glext)
+endif ()
 
 
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 34df3ad33b..007b8dfba6 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 include(Variables)
-include(GLH)
+include(GLEXT)
 include(Prebuilt)
 
 include_guard()
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 8e91dac109..a1a24de04b 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -67,7 +67,6 @@ elseif (WINDOWS)
           legacy_stdio_definitions
           )
 elseif (DARWIN)
-  include(CMakeFindFrameworks)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   find_library(CARBON_LIBRARY Carbon)
   find_library(COCOA_LIBRARY Cocoa)
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index da5d2ef22c..7cce190f6a 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -13,7 +13,7 @@ elseif (WINDOWS)
   foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
     # prefer more recent Python versions to older ones, if multiple versions
     # are installed
-    foreach(pyver 3.12 3.11 3.10 3.9 3.8 3.7)
+    foreach(pyver 3.13 3.12 3.11 3.10 3.9 3.8 3.7)
       list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
     endforeach()
   endforeach()