Merge branch 'develop' into marchcat/b-develop

5 files changed, 6 insertions, 33 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 25841d9d78..731a6d7f93 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -109,11 +109,6 @@ if (WINDOWS)
     string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   endif()
 
-  # workaround for github runner image breakage:
-  # https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161
-  # can be removed after the above issue is resolved and deployed across GHA
-  add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-
   # Allow use of sprintf etc
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif (WINDOWS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 293d8931cb..57f44dae59 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -24,7 +24,8 @@ if (WINDOWS)
           libboost_program_options-mt${addrsfx}
           libboost_regex-mt${addrsfx}
           libboost_system-mt${addrsfx}
-          libboost_thread-mt${addrsfx})
+          libboost_thread-mt${addrsfx}
+          libboost_url-mt${addrsfx})
 elseif (LINUX)
   target_link_libraries( ll::boost INTERFACE
           boost_fiber-mt${addrsfx}
@@ -32,9 +33,9 @@ elseif (LINUX)
           boost_filesystem-mt${addrsfx}
           boost_program_options-mt${addrsfx}
           boost_regex-mt${addrsfx}
-          boost_thread-mt${addrsfx}
           boost_system-mt${addrsfx}
-  )
+          boost_thread-mt${addrsfx}
+          boost_url-mt${addrsfx})
 elseif (DARWIN)
   target_link_libraries( ll::boost INTERFACE
           boost_context-mt${addrsfx}
@@ -43,7 +44,8 @@ elseif (DARWIN)
           boost_program_options-mt${addrsfx}
           boost_regex-mt${addrsfx}
           boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx})
+          boost_thread-mt${addrsfx}
+          boost_url-mt${addrsfx})
 endif (WINDOWS)
 
 if (LINUX)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 1692fa2415..10b17a6e26 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -56,7 +56,6 @@ set(cmake_SOURCE_FILES
         Tut.cmake
         UI.cmake
         UnixInstall.cmake
-        URIPARSER.cmake
         Variables.cmake
         ViewerMiscLibs.cmake
         VisualLeakDetector.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7dbbdb81b7..28c7377e23 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -58,7 +58,6 @@ if(WINDOWS)
         libaprutil-1.dll
         nghttp2.dll
         libhunspell.dll
-        uriparser.dll
         )
 
     # OpenSSL
@@ -190,9 +189,6 @@ elseif(DARWIN)
         libndofdev.dylib
         libnghttp2.dylib
         libnghttp2.14.dylib
-        liburiparser.dylib
-        liburiparser.1.dylib
-        liburiparser.1.0.27.dylib
        )
 
     if (TARGET ll::openal)
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
deleted file mode 100644
index 6c33ff70e1..0000000000
--- a/indra/cmake/URIPARSER.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- cmake -*-
-
-include_guard()
-
-include(Prebuilt)
-
-add_library( ll::uriparser INTERFACE IMPORTED )
-
-use_system_binary( uriparser )
-
-use_prebuilt_binary(uriparser)
-if (WINDOWS)
-  target_link_libraries( ll::uriparser INTERFACE uriparser)
-elseif (LINUX)
-  target_link_libraries( ll::uriparser INTERFACE uriparser)
-elseif (DARWIN)
-  target_link_libraries( ll::uriparser INTERFACE liburiparser.dylib)
-endif (WINDOWS)
-target_include_directories( ll::uriparser SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/uriparser)