From 77d71dec863e28323bcafb1573cd1ecd54fe3049 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 28 Aug 2025 00:43:38 -0400
Subject: Fix up universal build

---
 indra/cmake/OpenJPEG.cmake  | 4 +++-
 indra/cmake/Variables.cmake | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index d31df57689..33e9cf4898 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -1,7 +1,9 @@
 # -*- cmake -*-
+include_guard()
+
 include(Prebuilt)
+include(Linking)
 
-include_guard()
 add_library( ll::openjpeg INTERFACE IMPORTED )
 
 use_system_binary(openjpeg)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index a315943a90..8dc51f6efa 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -184,9 +184,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "")
   set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES)
   set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
-  set(CMAKE_OSX_ARCHITECTURES "${ARCH}")
-  string(REPLACE "i686"  "i386"   CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
-  string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
+  if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+  endif()
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Default deploy grid
-- 
cgit v1.3