1 files changed, 15 insertions, 29 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 14ea27e686..25d673e49a 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -13,9 +13,9 @@ elseif (WINDOWS)
   target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include)
   target_link_directories( ll::boost INTERFACE ${prefix_result})
   if ($ENV{MSYSTEM_CARCH} MATCHES aarch64)
-    set(sfx -vc143-mt-a64-1_90)
+    set(sfx -vc143-mt-a64-1_91)
   else ()
-    set(sfx -vc143-mt-x64-1_90)
+    set(sfx -vc143-mt-x64-1_91)
   endif ()
 else ()
   find_package( Boost )
@@ -33,7 +33,7 @@ if (WINDOWS)
 else ()
   target_link_libraries( ll::boost INTERFACE boost_regex${sfx})
 endif ()
-if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR WINDOWS OR CMAKE_SYSTEM_NAME MATCHES FreeBSD))
+if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES fedora) OR DARWIN)
   target_link_libraries( ll::boost INTERFACE boost_system${sfx})
 endif ()
 target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )
@@ -55,48 +55,42 @@ if (WINDOWS)
 
     find_library(BOOST_CONTEXT_LIBRARY
         NAMES
+        libboost_context
         libboost_context-mt
         libboost_context-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_FIBER_LIBRARY
         NAMES
+        libboost_fiber
         libboost_fiber-mt
         libboost_fiber-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_FILESYSTEM_LIBRARY
         NAMES
+        libboost_filesystem
         libboost_filesystem-mt
         libboost_filesystem-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_PROGRAMOPTIONS_LIBRARY
         NAMES
+        libboost_program_options
         libboost_program_options-mt
         libboost_program_options-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
-    find_library(BOOST_REGEX_LIBRARY
-        NAMES
-        libboost_regex-mt
-        libboost_regex-mt${addrsfx}
-        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-    find_library(BOOST_SYSTEM_LIBRARY
-        NAMES
-        libboost_system-mt
-        libboost_system-mt${addrsfx}
-        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
     find_library(BOOST_THREAD_LIBRARY
         NAMES
+        libboost_thread
         libboost_thread-mt
         libboost_thread-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_URL_LIBRARY
         NAMES
+        libboost_url
         libboost_url-mt
         libboost_url-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
@@ -105,48 +99,42 @@ else (WINDOWS)
 
     find_library(BOOST_CONTEXT_LIBRARY
        NAMES
+       boost_context
        boost_context-mt
        boost_context-mt${addrsfx}
        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_FIBER_LIBRARY
         NAMES
+        boost_fiber
         boost_fiber-mt
         boost_fiber-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_FILESYSTEM_LIBRARY
         NAMES
+        boost_filesystem
         boost_filesystem-mt
         boost_filesystem-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_PROGRAMOPTIONS_LIBRARY
         NAMES
+        boost_program_options
         boost_program_options-mt
         boost_program_options-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
-    find_library(BOOST_REGEX_LIBRARY
-        NAMES
-        boost_regex-mt
-        boost_regex-mt${addrsfx}
-        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-    find_library(BOOST_SYSTEM_LIBRARY
-        NAMES
-        boost_system-mt
-        boost_system-mt${addrsfx}
-        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
     find_library(BOOST_THREAD_LIBRARY
         NAMES
+        boost_thread
         boost_thread-mt
         boost_thread-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
     find_library(BOOST_URL_LIBRARY
         NAMES
+        boost_url
         boost_url-mt
         boost_url-mt${addrsfx}
         PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
@@ -158,8 +146,6 @@ target_link_libraries(ll::boost INTERFACE
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_PROGRAMOPTIONS_LIBRARY}
-    ${BOOST_REGEX_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
     ${BOOST_THREAD_LIBRARY}
     ${BOOST_URL_LIBRARY})