1 files changed, 110 insertions, 31 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 8459214f59..ba9daeadf1 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -50,39 +50,118 @@ use_prebuilt_binary(boost)
 set(addrsfx "-x${ADDRESS_SIZE}")
 
 if (WINDOWS)
-  target_link_libraries( ll::boost INTERFACE
-          libboost_context-mt${addrsfx}
-          libboost_fiber-mt${addrsfx}
-          libboost_filesystem-mt${addrsfx}
-          libboost_program_options-mt${addrsfx}
-          libboost_regex-mt${addrsfx}
-          libboost_system-mt${addrsfx}
-          libboost_thread-mt${addrsfx}
-          libboost_url-mt${addrsfx})
-elseif (LINUX)
-  target_link_libraries( ll::boost INTERFACE
-          boost_fiber-mt${addrsfx}
-          boost_context-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-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}
-          boost_fiber-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx}
-          boost_url-mt${addrsfx})
+
+    find_library(BOOST_CONTEXT_LIBRARY
+        NAMES
+        libboost_context-mt
+        libboost_context-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FIBER_LIBRARY
+        NAMES
+        libboost_fiber-mt
+        libboost_fiber-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FILESYSTEM_LIBRARY
+        NAMES
+        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-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-mt
+        libboost_thread-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_URL_LIBRARY
+        NAMES
+        libboost_url-mt
+        libboost_url-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+else (WINDOWS)
+
+    find_library(BOOST_CONTEXT_LIBRARY
+       NAMES
+       boost_context-mt
+       boost_context-mt${addrsfx}
+       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FIBER_LIBRARY
+        NAMES
+        boost_fiber-mt
+        boost_fiber-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FILESYSTEM_LIBRARY
+        NAMES
+        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-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-mt
+        boost_thread-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_URL_LIBRARY
+        NAMES
+        boost_url-mt
+        boost_url-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
 endif (WINDOWS)
 
+target_link_libraries(ll::boost INTERFACE
+    ${BOOST_FIBER_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_FILESYSTEM_LIBRARY}
+    ${BOOST_PROGRAMOPTIONS_LIBRARY}
+    ${BOOST_REGEX_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
+    ${BOOST_THREAD_LIBRARY}
+    ${BOOST_URL_LIBRARY})
+
 if (LINUX)
-    set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
-    set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt)
+    target_link_libraries(ll::boost INTERFACE rt)
 endif (LINUX)