From dbf9fcedb1caaa34dee5ec4a24aafbffb326b9cc Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 27 Apr 2025 19:15:05 +0800
Subject: Back to one Meshoptimizer try_compile for all OSes

CMAKE_OSX_ARCHITECTURES & CMAKE_OSX_DEPLOYMENT_TARGET won't affect non-macOS.
Settings such as those 2, and CMAKE_BUILD_TYPE, aren't inherited,
so the significant ones should be set explicitly.
Meshoptimizer default installation header directory is without the
encapsulating "meshoptimizer" directory.
---
 indra/cmake/Meshoptimizer.cmake | 43 ++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

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

diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index 20eef33d7c..d5c6598d94 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -27,33 +27,24 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  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)
+  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_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
+      -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE}
+      -DCMAKE_INSTALL_INCLUDEDIR:PATH=${LIBS_PREBUILT_DIR}/include/meshoptimizer
+  )
   if (${MESHOPTIMIZER_RESULT})
-    file(
-      COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/src/meshoptimizer.h
-      DESTINATION ${LIBS_PREBUILT_DIR}/include/meshoptimizer
-      )
-    file(
-      COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/libmeshoptimizer.a
-      DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+    execute_process(
+      COMMAND ${CMAKE_MAKE_PROGRAM} install
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+      OUTPUT_VARIABLE meshoptimizer_installed
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
   endif (${MESHOPTIMIZER_RESULT})
-- 
cgit v1.2.3