From 7bba6b835f2a64367399931b06597046b6f9e004 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Sun, 2 Feb 2025 07:08:40 -0500
Subject: Update dependencies with support for apple silicon

---
 indra/cmake/Boost.cmake | 92 +++++++++++++++++++++++++++++++------------------
 1 file changed, 58 insertions(+), 34 deletions(-)

(limited to 'indra/cmake/Boost.cmake')

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 8c5b946753..518e678585 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -16,41 +16,65 @@ use_prebuilt_binary(boost)
 # with the address size.
 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_context-mt${addrsfx}
-          boost_fiber-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_signals-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})
-endif (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)
+
+target_link_libraries(ll::boost INTERFACE
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_FIBER_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)
 
-- 
cgit v1.2.3


From 5ffcd3dc88892a651fe9a95974280efb85e18a8b Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 28 Aug 2025 14:09:03 -0400
Subject: Fixes for GHA build

---
 indra/cmake/Boost.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake/Boost.cmake')

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 518e678585..7b3882c936 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -65,8 +65,8 @@ find_library(BOOST_URL_LIBRARY
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 target_link_libraries(ll::boost INTERFACE
-    ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FIBER_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_PROGRAMOPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
-- 
cgit v1.2.3