diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-04 14:07:51 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-04 14:07:51 +0800 |
| commit | 2121d3b20269baeb8bb88cef534307628f1adb2e (patch) | |
| tree | bd7f3b1ebd0fdb8d43a6f9078b9542b9d06b10ce /indra/cmake/Meshoptimizer.cmake | |
| parent | cbcc1f0623aaf13b55a6fd4ab5b0f663cd3651ed (diff) | |
| parent | cb9cd84b0e8f988fda136130bcb9e59cab934eaf (diff) | |
Merge branch 'main' into 26.3
Diffstat (limited to 'indra/cmake/Meshoptimizer.cmake')
| -rw-r--r-- | indra/cmake/Meshoptimizer.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake index 225f44b1fb..e65d0cac71 100644 --- a/indra/cmake/Meshoptimizer.cmake +++ b/indra/cmake/Meshoptimizer.cmake @@ -16,20 +16,20 @@ if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR CMAKE_ elseif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND NOT (${LINUX_DISTRO} MATCHES gentoo)) use_prebuilt_binary(meshoptimizer) elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0) - if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz) + if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz) file(DOWNLOAD - https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz - ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz + https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.2.tar.gz + ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz ) endif () file(ARCHIVE_EXTRACT - INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz + INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz DESTINATION ${CMAKE_BINARY_DIR} ) try_compile(MESHOPTIMIZER_RESULT PROJECT meshoptimizer - SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 - BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 + SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.2 + BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.2 TARGET meshoptimizer CMAKE_FLAGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} @@ -42,7 +42,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA if (${MESHOPTIMIZER_RESULT}) execute_process( COMMAND ${CMAKE_MAKE_PROGRAM} install - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.2 OUTPUT_VARIABLE meshoptimizer_installed ) file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}") |