From 51ed6b5424a626499ddb7f95e6da7cf34b375f6a Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Tue, 21 Jan 2025 01:20:11 -0500
Subject: Update to use universal build flags and fix cmake deprecations

---
 indra/cmake/Linking.cmake | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 1d757abeff..1093fc7f71 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -67,7 +67,6 @@ elseif (WINDOWS)
           legacy_stdio_definitions
           )
 else()
-  include(CMakeFindFrameworks)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   find_library(CARBON_LIBRARY Carbon)
   find_library(COCOA_LIBRARY Cocoa)
-- 
cgit v1.2.3


From a455d3ee7d5ddefcdf008fa86ecc7c80aba758aa Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Mon, 3 Feb 2025 11:35:22 -0500
Subject: Introduce build system and preprocessor support for ARM64

---
 indra/cmake/Linking.cmake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 1093fc7f71..3f4d0ed534 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -38,9 +38,10 @@ endif ()
 # windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
 # that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
 # CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
-
-link_directories(${AUTOBUILD_INSTALL_DIR}/lib/$<LOWER_CASE:$<CONFIG>>)
-link_directories(${AUTOBUILD_INSTALL_DIR}/lib/release)
+if(NOT DARWIN)
+  link_directories(${AUTOBUILD_INSTALL_DIR}/lib/$<LOWER_CASE:$<CONFIG>>)
+  link_directories(${AUTOBUILD_INSTALL_DIR}/lib/release)
+endif(NOT DARWIN)
 
 add_library( ll::oslibraries INTERFACE IMPORTED )
 
@@ -75,6 +76,8 @@ else()
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COREAUDIO_LIBRARY CoreAudio)
+  find_library(COREGRAPHICS_LIBRARY CoreGraphics)
+  find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
 
   target_link_libraries( ll::oslibraries INTERFACE
           ${COCOA_LIBRARY}
@@ -84,6 +87,8 @@ else()
           ${AGL_LIBRARY}
           ${APPKIT_LIBRARY}
           ${COREAUDIO_LIBRARY}
+          ${AUDIOTOOLBOX_LIBRARY}
+          ${COREGRAPHICS_LIBRARY}
           )
 endif()
 
-- 
cgit v1.2.3