1 files changed, 101 insertions, 47 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 7b3882c936..b57c33c3e0 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -16,53 +16,107 @@ use_prebuilt_binary(boost)
 # with the address size.
 set(addrsfx "-x${ADDRESS_SIZE}")
 
-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)
+if (WINDOWS)
+
+    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}