13 files changed, 116 insertions, 286 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 8fd5e4020c..0e3b89e98e 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -253,6 +253,10 @@ if (DARWIN)
     list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable )
   endif()
 
+  if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
+    list(APPEND GCC_WARNINGS "-Wno-#warnings" )
+  endif()
+
   add_compile_options(${GCC_WARNINGS})
   add_compile_options(-m${ADDRESS_SIZE})
 endif ()
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 506f792570..78c536e9d4 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -5,7 +5,7 @@ include_guard()
 
 add_library( ll::apr INTERFACE IMPORTED )
 
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(Apr REQUIRED apr-1 apr-util-1)
   target_include_directories(ll::apr SYSTEM INTERFACE ${Apr_INCLUDE_DIRS})
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 3c4c0ef1a7..514d283e76 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -5,7 +5,7 @@ include(Prebuilt)
 include_guard()
 add_library( ll::vorbis INTERFACE IMPORTED )
 
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(Vorbis REQUIRED ogg vorbis vorbisenc vorbisfile)
   target_include_directories(ll::vorbis SYSTEM INTERFACE ${Vorbis_INCLUDE_DIRS})
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 00173e5418..9e9bbce47b 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -13,7 +13,7 @@ use_prebuilt_binary(curl)
   if (DARWIN)
     execute_process(
       COMMAND lipo -archs libcurl.a
-      WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+      WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
       OUTPUT_VARIABLE curl_archs
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
@@ -23,7 +23,7 @@ use_prebuilt_binary(curl)
           libcurl.a
           -thin ${CMAKE_OSX_ARCHITECTURES}
           -output libcurl.a
-        WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+        WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
     endif (NOT ${curl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
   endif (DARWIN)
@@ -46,23 +46,9 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
   endif ()
   file(
     COPY
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curl.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlbuild.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlrules.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlver.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/easy.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/mprintf.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/multi.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/stdcheaders.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/system.h
-      ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/typecheck-gcc.h
-    DESTINATION ${LIBS_PREBUILT_DIR}/include/curl
-    )
-  file(
-    COPY
-      ${LIBS_PREBUILT_DIR}/lib/release/libcrypto.a
-      ${LIBS_PREBUILT_DIR}/lib/release/libssl.a
-    DESTINATION ${LIBS_PREBUILT_DIR}/lib
+      ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a
+      ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a
+    DESTINATION ${ARCH_PREBUILT_DIRS}
     )
   if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     message("We need to temporarily have OpenSSL3 header directory and libraries renamed just until the libcurl building process with OpenSSL1.1 now is finished.")
@@ -74,17 +60,18 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
   endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
   set(ENV{CFLAGS} "-std=c90")
   execute_process(
-    COMMAND ./configure --disable-alt-svc --disable-dict --disable-doh --disable-file --disable-gopher --disable-headers-api --disable-hsts --disable-imap --disable-ldap --disable-ldaps --disable-libcurl-option --disable-manual --disable-mqtt --disable-ntlm --disable-ntlm-wb --disable-pop3 --disable-rtsp --disable-shared --disable-smb --disable-smtp --disable-sspi --disable-telnet --disable-tftp --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-threaded-resolver --with-ssl=${LIBS_PREBUILT_DIR} --without-libidn2 --without-libpsl --without-libssh2
+    COMMAND ./configure --disable-alt-svc --disable-dict --disable-doh --disable-file --disable-gopher --disable-headers-api --disable-hsts --disable-imap --disable-ldap --disable-ldaps --disable-libcurl-option --disable-manual --disable-mqtt --disable-ntlm --disable-ntlm-wb --disable-pop3 --disable-rtsp --disable-shared --disable-smb --disable-smtp --disable-sspi --disable-telnet --disable-tftp --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-threaded-resolver --with-ssl=${LIBS_PREBUILT_DIR} --without-libidn2 --without-libpsl --without-libssh2 --prefix=${LIBS_PREBUILT_DIR} --libdir=${ARCH_PREBUILT_DIRS_RELEASE}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl
     )
   execute_process(
     COMMAND make -j${MAKE_JOBS}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl
-    RESULT_VARIABLE curl_installed
     )
-  file(
-    COPY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/lib/.libs/libcurl.a
-    DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+  unset(ENV{CFLAGS})
+  execute_process(
+    COMMAND make install
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl
+    RESULT_VARIABLE curl_installed
     )
   if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     execute_process(COMMAND sudo mv /usr/include/openssl3 /usr/include/openssl)
@@ -95,8 +82,8 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     message("OpenSSL3 header directory and library names have been restored.")
   endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
   file(REMOVE
-    ${LIBS_PREBUILT_DIR}/lib/libcrypto.a
-    ${LIBS_PREBUILT_DIR}/lib/libssl.a
+    ${ARCH_PREBUILT_DIRS}/libcrypto.a
+    ${ARCH_PREBUILT_DIRS}/libssl.a
     )
   file(WRITE ${PREBUILD_TRACKING_DIR}/curl_installed "${curl_installed}")
 endif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR DARWIN OR NOT USESYSTEMLIBS)
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index d97251885f..35ce932c1a 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -31,7 +31,7 @@ if (USE_FMODSTUDIO)
     # as accessing the private LL location will fail if you don't have the credential
     include(Prebuilt)
     if (USESYSTEMLIBS AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/fmodstudio_installed OR NOT ${fmodstudio_installed} EQUAL 0))
-      file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release)
+      file(MAKE_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE})
       if (DARWIN)
         execute_process(
           COMMAND hdiutil attach -noverify fmodstudioapi20228mac-installer.dmg
@@ -53,7 +53,7 @@ if (USE_FMODSTUDIO)
           COMMAND lipo
             lib/libfmod.dylib
             -thin ${CMAKE_OSX_ARCHITECTURES}
-            -output ${LIBS_PREBUILT_DIR}/lib/release/libfmod.dylib
+            -output ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.dylib
           WORKING_DIRECTORY /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core
           )
         execute_process(
@@ -85,7 +85,7 @@ if (USE_FMODSTUDIO)
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so.13
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so.13.28
-            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+            DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
         else ()
@@ -94,7 +94,7 @@ if (USE_FMODSTUDIO)
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
               ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.28
-            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+            DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
         endif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index d94def5808..335c2a9258 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -48,82 +48,45 @@ if( USESYSTEMLIBS )
         INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8.tar.gz
         DESTINATION ${CMAKE_BINARY_DIR}
         )
-      file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
+      execute_process(
+        COMMAND sed -i "" -e "s/SHARED/STATIC/g" CMakeLists.txt
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4
+        )
       if( DARWIN )
-        try_compile(COLLADADOM_RESULT
-          PROJECT colladadom
-          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
-          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
-          TARGET collada14dom
-          CMAKE_FLAGS
-            -DCMAKE_CXX_STANDARD:STRING=17
-            -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-            "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib"
-            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-            -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
-            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
-            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
-            -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
-            -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-            -DBoost_CFLAGS:STRING=-I${Libxml2_LIBRARY_DIRS}exec/boost/1.87/include
-            -DOPT_COLLADA14:BOOL=ON
-            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
-            -DCOLLADA_DOM_SOVERSION:STRING=0
-            -DCOLLADA_DOM_VERSION:STRING=2.3-r8
-          OUTPUT_VARIABLE colladadom_installed
-          )
-        if( ${COLLADADOM_RESULT} )
-          file(
-            COPY
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.2.3-r8.dylib
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.0.dylib
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.dylib
-            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
-            FOLLOW_SYMLINK_CHAIN
-            )
-        endif( ${COLLADADOM_RESULT} )
-      else( DARWIN )
+        set(BOOST_CFLAGS -I${Libxml2_LIBRARY_DIRS}exec/boost/1.87/include)
+        set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib)
+        set(BOOST_LIBRARY_SUFFIX -mt)
+      endif()
+      try_compile(COLLADADOM_RESULT
+        PROJECT colladadom
+        SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
+        BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
+        TARGET collada14dom
+        CMAKE_FLAGS
+          -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+          -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+          -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+          -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
+          -DCMAKE_CXX_STANDARD:STRING=17
+          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+          -DBoost_CFLAGS:STRING=${BOOST_CFLAGS}
+          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
+          "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} ${BOOST_LIBS}"
+          -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem${BOOST_LIBRARY_SUFFIX}
+          -DBoost_SYSTEM_LIBRARY:STRING=boost_system${BOOST_LIBRARY_SUFFIX}
+          -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
+          -DOPT_COLLADA14:BOOL=ON
+          -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:PATH=${LIBS_PREBUILT_DIR}/include/collada
+        )
+      if( ${COLLADADOM_RESULT} )
         execute_process(
-          COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt
-          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src
-          )
-        try_compile(COLLADADOM_RESULT
-          PROJECT colladadom
-          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
-          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
-          TARGET collada14dom
-          CMAKE_FLAGS
-            -DCMAKE_CXX_STANDARD:STRING=17
-            -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-            -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}
-            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
-            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem
-            -DBoost_SYSTEM_LIBRARY:STRING=boost_system
-            -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-            -DOPT_COLLADA14:BOOL=ON
-            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
-            -DCOLLADA_DOM_SOVERSION:STRING=0
-            -DCOLLADA_DOM_VERSION:STRING=2.3-r8
+          COMMAND ${CMAKE_MAKE_PROGRAM} install
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
           OUTPUT_VARIABLE colladadom_installed
           )
-        if( ${COLLADADOM_RESULT} )
-          file(
-            COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.a
-            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
-            )
-        endif( ${COLLADADOM_RESULT} )
-      endif( DARWIN )
-      if( ${COLLADADOM_RESULT} )
-        file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada/1.4)
-        file(
-          COPY
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/1.4
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/1.5
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dae
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dae.h
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dom.h
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/modules
-          DESTINATION ${LIBS_PREBUILT_DIR}/include/collada
+        file(RENAME
+          ${ARCH_PREBUILT_DIRS}/libcollada14dom.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom.a
           )
         file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
       endif( ${COLLADADOM_RESULT} )
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index 20eef33d7c..d5c6598d94 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -27,33 +27,24 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  if (DARWIN)
-    try_compile(MESHOPTIMIZER_RESULT
-      PROJECT meshoptimizer
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-      BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-      TARGET meshoptimizer
-      CMAKE_FLAGS
-        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
-      OUTPUT_VARIABLE meshoptimizer_installed
-    )
-  else ()
-    try_compile(MESHOPTIMIZER_RESULT
-      PROJECT meshoptimizer
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-      BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-      TARGET meshoptimizer
-      OUTPUT_VARIABLE meshoptimizer_installed
-    )
-  endif (DARWIN)
+  try_compile(MESHOPTIMIZER_RESULT
+    PROJECT meshoptimizer
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+    BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+    TARGET meshoptimizer
+    CMAKE_FLAGS
+      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
+      -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE}
+      -DCMAKE_INSTALL_INCLUDEDIR:PATH=${LIBS_PREBUILT_DIR}/include/meshoptimizer
+  )
   if (${MESHOPTIMIZER_RESULT})
-    file(
-      COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/src/meshoptimizer.h
-      DESTINATION ${LIBS_PREBUILT_DIR}/include/meshoptimizer
-      )
-    file(
-      COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/libmeshoptimizer.a
-      DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+    execute_process(
+      COMMAND ${CMAKE_MAKE_PROGRAM} install
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      OUTPUT_VARIABLE meshoptimizer_installed
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
   endif (${MESHOPTIMIZER_RESULT})
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 0b0a2b6ca9..24fb23a0e3 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -25,8 +25,10 @@ if (NDOF)
         BINARY_DIR ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev
         TARGET ndofdev
         CMAKE_FLAGS
-          -DCMAKE_C_FLAGS:STRING=-DTARGET_OS_MAC\ -Wno-int-conversion
+          -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+          -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+          -DCMAKE_C_FLAGS:STRING=-DTARGET_OS_MAC\ -Wno-int-conversion
         OUTPUT_VARIABLE libndofdev_installed
         )
       if (${LIBNDOFDEV_RESULT})
@@ -36,7 +38,7 @@ if (NDOF)
           )
         file(
           COPY ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev/src/libndofdev.dylib
-          DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+          DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
           )
         file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
       endif (${LIBNDOFDEV_RESULT})
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 6555027dc1..f2eb956e2e 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -19,7 +19,7 @@ endif()
 if (USE_OPENAL)
   add_library( ll::openal INTERFACE IMPORTED )
 
-  if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+  if (USESYSTEMLIBS)
     target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
     include(FindPkgConfig)
     pkg_check_modules(Openal REQUIRED freealut)
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index d4304f93b3..cf008faebf 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -20,45 +20,38 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  if (DARWIN)
-    try_compile(OPENJPEG_RESULT
-      PROJECT OPENJPEG
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-      BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-      TARGET openjp2
-      CMAKE_FLAGS
-        -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+  try_compile(OPENJPEG_RESULT
+    PROJECT OPENJPEG
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+    BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+    TARGET openjp2
+    CMAKE_FLAGS
+      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
+      -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE}
+      -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
+      -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+      -DBUILD_CODEC:BOOL=OFF
+    )
+  if (${OPENJPEG_RESULT})
+    execute_process(
+      COMMAND ${CMAKE_MAKE_PROGRAM} install
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
       OUTPUT_VARIABLE openjpeg_installed
       )
-  else ()
-    try_compile(OPENJPEG_RESULT
-      PROJECT OPENJPEG
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-      BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-      TARGET openjp2
-      CMAKE_FLAGS
-        -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-      OUTPUT_VARIABLE openjpeg_installed
+    file(RENAME
+      ${LIBS_PREBUILT_DIR}/include/openjpeg-2.5
+      ${LIBS_PREBUILT_DIR}/include/openjpeg
       )
-  endif (DARWIN)
-  if (${OPENJPEG_RESULT})
     file(
       COPY
         ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/cio.h
         ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/event.h
-        ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/openjpeg.h
-        ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/opj_config.h
         ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/opj_config_private.h
-        ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/src/lib/openjp2/opj_stdint.h
       DESTINATION ${LIBS_PREBUILT_DIR}/include/openjpeg
       )
-    file(
-      COPY ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg/bin/libopenjp2.a
-      DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
-      )
     file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}")
   endif (${OPENJPEG_RESULT})
 endif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR NOT USESYSTEMLIBS)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 43470032a9..8b9c737325 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -13,7 +13,7 @@ use_prebuilt_binary(openssl)
   if (DARWIN)
     execute_process(
       COMMAND lipo -archs libcrypto.a
-      WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+      WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
       OUTPUT_VARIABLE crypto_archs
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
@@ -23,12 +23,12 @@ use_prebuilt_binary(openssl)
           libcrypto.a
           -thin ${CMAKE_OSX_ARCHITECTURES}
           -output libcrypto.a
-        WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+        WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
     endif (NOT ${crypto_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
     execute_process(
       COMMAND lipo -archs libssl.a
-      WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+      WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
       OUTPUT_VARIABLE ssl_archs
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
@@ -38,7 +38,7 @@ use_prebuilt_binary(openssl)
           libssl.a
           -thin ${CMAKE_OSX_ARCHITECTURES}
           -output libssl.a
-        WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release
+        WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
     endif (NOT ${ssl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
   endif (DARWIN)
@@ -48,133 +48,23 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1w.tar.gz
       ${CMAKE_BINARY_DIR}/OpenSSL_1_1_1w.tar.gz
       )
-  endif (NOT EXISTS ${CMAKE_BINARY_DIR}/OpenSSL_1_1_1w.tar.gz)
+  endif ()
   file(ARCHIVE_EXTRACT
     INPUT ${CMAKE_BINARY_DIR}/OpenSSL_1_1_1w.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
   execute_process(
-    COMMAND ./config no-shared
+    COMMAND ./config no-shared --openssldir=${LIBS_PREBUILT_DIR}/ssl --prefix=${LIBS_PREBUILT_DIR} --libdir=${ARCH_PREBUILT_DIRS_RELEASE}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w
     )
   execute_process(
     COMMAND make -j${MAKE_JOBS}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w
-    RESULT_VARIABLE openssl_installed
-    )
-  file(
-    COPY
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/aes.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/asn1.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/asn1_mac.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/asn1err.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/asn1t.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/async.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/asyncerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/bio.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/bioerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/blowfish.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/bn.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/bnerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/buffer.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/buffererr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/camellia.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cast.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cmac.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cms.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cmserr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/comp.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/comperr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/conf.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/conf_api.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/conferr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/crypto.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cryptoerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ct.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/cterr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/des.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/dh.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/dherr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/dsa.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/dsaerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/dtls1.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/e_os2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ebcdic.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ec.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ecdh.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ecdsa.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ecerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/engine.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/engineerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/err.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/evp.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/evperr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/hmac.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/idea.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/kdf.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/kdferr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/lhash.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/md2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/md4.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/md5.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/mdc2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/modes.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/obj_mac.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/objects.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/objectserr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ocsp.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ocsperr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/opensslconf.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/opensslv.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ossl_typ.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pem.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pem2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pemerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pkcs12.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pkcs12err.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pkcs7.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/pkcs7err.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rand.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rand_drbg.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/randerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rc2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rc4.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rc5.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ripemd.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rsa.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/rsaerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/safestack.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/seed.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/sha.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/srp.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/srtp.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ssl.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ssl2.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ssl3.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/sslerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/stack.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/store.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/storeerr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/symhacks.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/tls1.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ts.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/tserr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/txt_db.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/ui.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/uierr.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/whrlpool.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/x509.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/x509_vfy.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/x509err.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/x509v3.h
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/include/openssl/x509v3err.h
-    DESTINATION ${LIBS_PREBUILT_DIR}/include/openssl
     )
-  file(
-    COPY
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/libcrypto.a
-      ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w/libssl.a
-    DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+  execute_process(
+    COMMAND make install
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/openssl-OpenSSL_1_1_1w
+    RESULT_VARIABLE openssl_installed
     )
   file(WRITE ${PREBUILD_TRACKING_DIR}/openssl_installed "${openssl_installed}")
 endif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR DARWIN OR NOT USESYSTEMLIBS)
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake
index a5c821f32a..19457924d8 100644
--- a/indra/cmake/WebRTC.cmake
+++ b/indra/cmake/WebRTC.cmake
@@ -65,13 +65,13 @@ elseif (NOT (WINDOWS OR CMAKE_SYSTEM_NAME MATCHES FreeBSD))
         endforeach()
         file(RENAME
             ${LIBS_PREBUILT_DIR}/lib/libwebrtc.a
-            ${LIBS_PREBUILT_DIR}/lib/release/libwebrtc.a
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libwebrtc.a
             )
         if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
-            file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/lib/release/WebRTC.framework)
+            file(REMOVE_RECURSE ${ARCH_PREBUILT_DIRS_RELEASE}/WebRTC.framework)
             file(RENAME
                 ${LIBS_PREBUILT_DIR}/Frameworks/WebRTC.xcframework/${WEBRTC_PLATFORM}/WebRTC.framework
-                ${LIBS_PREBUILT_DIR}/lib/release/WebRTC.framework
+                ${ARCH_PREBUILT_DIRS_RELEASE}/WebRTC.framework
                 )
             file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/Frameworks)
         endif (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
diff --git a/indra/cmake/xxHash.cmake b/indra/cmake/xxHash.cmake
index 2dcab005ba..7e113feda2 100644
--- a/indra/cmake/xxHash.cmake
+++ b/indra/cmake/xxHash.cmake
@@ -6,7 +6,7 @@ set (XXHASH_CMAKE_INCLUDED TRUE)
 
 include(Prebuilt)
 
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(Xxhash REQUIRED libxxhash)
   return ()