From a09b7d7679ba34482e267f9a5b39a79fd3866af4 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 13:33:02 +0800
Subject: Not override CMAKE_OSX_ARCHITECTURES to one arch

Now you can pass -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` or
-DCMAKE_OSX_ARCHITECTURES:STRING="arm64;x86_64" and it will build
as intended.
---
 indra/cmake/Variables.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 59725ecc65..f1a4d43f90 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -204,7 +204,7 @@ 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}")
+  #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}")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-- 
cgit v1.2.3


From 9d088bea3cc29dde6290db9e6da5dafd4f3ec524 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 8 Jul 2024 16:15:09 +0800
Subject: GLH and Mikktspace can be untarred in packages now

They're custom anyway so very unlikely to be reused in other projects.
TinyGLTF.cmake changes here just to minimise diff, the include
directory setting does not have any effect (just like in TinyEXR.cmake).
---
 indra/cmake/GLH.cmake      | 5 ++---
 indra/cmake/TinyGLTF.cmake | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
index 09f7d568be..bdd8bc4836 100644
--- a/indra/cmake/GLH.cmake
+++ b/indra/cmake/GLH.cmake
@@ -4,9 +4,8 @@ include(Prebuilt)
 add_library( ll::glh_linear INTERFACE IMPORTED )
 
 if (USESYSTEMLIBS)
-	target_include_directories(ll::glh_linear SYSTEM INTERFACE
-		${CMAKE_SYSROOT}/usr/local/include)
-	return ()
+  target_include_directories( ll::glh_linear SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+  return ()
 endif ()
 
 use_system_binary( glh_linear )
diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake
index b20a2a41de..7e74089208 100644
--- a/indra/cmake/TinyGLTF.cmake
+++ b/indra/cmake/TinyGLTF.cmake
@@ -2,10 +2,8 @@
 include(Prebuilt)
 
 if (NOT USESYSTEMLIBS)
-
 use_prebuilt_binary(tinygltf)
+endif (NOT USESYSTEMLIBS)
 
 set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf)
 
-endif (NOT USESYSTEMLIBS)
-
-- 
cgit v1.2.3


From e44ccd4f19146c3313ecc67f813547a8c37b5c0f Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 9 Jul 2024 00:07:24 +0800
Subject: NDOF can be enabled for Space Navigator support

---
 indra/cmake/NDOF.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index b88fbccf2a..aa0f0d042c 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -7,11 +7,13 @@ include_guard()
 add_library( ll::ndof INTERFACE IMPORTED )
 
 if (NDOF)
+  if (NOT USESYSTEMLIBS)
   if (WINDOWS OR DARWIN)
     use_prebuilt_binary(libndofdev)
   elseif (LINUX)
     use_prebuilt_binary(open-libndofdev)
   endif (WINDOWS OR DARWIN)
+  endif (NOT USESYSTEMLIBS)
 
   if (WINDOWS)
     target_link_libraries( ll::ndof INTERFACE libndofdev)
-- 
cgit v1.2.3