diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LibVLCPlugin.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/Meshoptimizer.cmake | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake index 45ef25a63c..981f020745 100644 --- a/indra/cmake/LibVLCPlugin.cmake +++ b/indra/cmake/LibVLCPlugin.cmake @@ -12,16 +12,16 @@ if (DARWIN) set(ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES}) endif () if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vlc_installed OR NOT ${vlc_installed} EQUAL 0) - if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.21-${ARCHITECTURE}.dmg) + if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg) file(DOWNLOAD - https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-${ARCHITECTURE}.dmg - ${CMAKE_BINARY_DIR}/vlc-3.0.21-${ARCHITECTURE}.dmg + https://get.videolan.org/vlc/3.0.23/macosx/vlc-3.0.23-${ARCHITECTURE}.dmg + ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg ) endif () file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "0") endif () execute_process( - COMMAND hdiutil attach -noverify vlc-3.0.21-${ARCHITECTURE}.dmg + COMMAND hdiutil attach -noverify vlc-3.0.23-${ARCHITECTURE}.dmg WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) target_include_directories( ll::libvlc SYSTEM INTERFACE /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/include) diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake index b1d2796915..225f44b1fb 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-0.21.tar.gz) + if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz) file(DOWNLOAD - https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.21.tar.gz - ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz + https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz + ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz ) endif () file(ARCHIVE_EXTRACT - INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz + INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.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 + SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 + BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 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-0.21 + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1 OUTPUT_VARIABLE meshoptimizer_installed ) file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}") |