From e178ce1945981fb1ad6cb4f4ca36809f904a205c Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 17 Apr 2025 16:34:01 +0800
Subject: Explicit on macOS deployment target when CMaking deps

Turns out it wasn't forwarded, when I was building on macOS 15 arm64.
---
 indra/cmake/LLPrimitive.cmake   |  1 +
 indra/cmake/Meshoptimizer.cmake | 24 ++++++++++++++++++------
 indra/cmake/NDOF.cmake          |  4 +++-
 indra/cmake/OpenJPEG.cmake      | 34 ++++++++++++++++++++++++----------
 4 files changed, 46 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 8055435c27..d94def5808 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -60,6 +60,7 @@ if( USESYSTEMLIBS )
             -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
             "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib"
             -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
             -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
             -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
             -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index d893ea35b2..91ffbf6440 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -27,13 +27,25 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  try_compile(MESHOPTIMIZER_RESULT
-    PROJECT meshoptimizer
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-    BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
-    TARGET meshoptimizer
-    OUTPUT_VARIABLE meshoptimizer_installed
+  if (DARWIN)
+    try_compile(MESHOPTIMIZER_RESULT
+      PROJECT meshoptimizer
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      TARGET meshoptimizer
+      CMAKE_FLAGS
+        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      OUTPUT_VARIABLE meshoptimizer_installed
     )
+  else ()
+    try_compile(MESHOPTIMIZER_RESULT
+      PROJECT meshoptimizer
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      TARGET meshoptimizer
+      OUTPUT_VARIABLE meshoptimizer_installed
+    )
+  endif (DARWIN)
   if (${MESHOPTIMIZER_RESULT})
     file(
       COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/src/meshoptimizer.h
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index b75bb2509d..0b0a2b6ca9 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -24,7 +24,9 @@ if (NDOF)
         SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev
         BINARY_DIR ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev
         TARGET ndofdev
-        CMAKE_FLAGS -DCMAKE_C_FLAGS:STRING=-DTARGET_OS_MAC\ -Wno-int-conversion
+        CMAKE_FLAGS
+          -DCMAKE_C_FLAGS:STRING=-DTARGET_OS_MAC\ -Wno-int-conversion
+          -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
         OUTPUT_VARIABLE libndofdev_installed
         )
       if (${LIBNDOFDEV_RESULT})
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 463e4365ce..623c2ecc67 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -20,16 +20,30 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  try_compile(OPENJPEG_RESULT
-    PROJECT OPENJPEG
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-    BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
-    TARGET openjp2
-    CMAKE_FLAGS
-      -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-      -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-    OUTPUT_VARIABLE openjpeg_installed
-    )
+  if (DARWIN)
+    try_compile(OPENJPEG_RESULT
+      PROJECT OPENJPEG
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+      BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+      TARGET openjp2
+      CMAKE_FLAGS
+        -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
+        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      OUTPUT_VARIABLE openjpeg_installed
+      )
+  else ()
+    try_compile(OPENJPEG_RESULT
+      PROJECT OPENJPEG
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+      BINARY_DIR ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248/openjpeg
+      TARGET openjp2
+      CMAKE_FLAGS
+        -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
+      OUTPUT_VARIABLE openjpeg_installed
+      )
+  endif (DARWIN)
   if (${OPENJPEG_RESULT})
     file(
       COPY
-- 
cgit v1.2.3