From 06af1b8cc8706fae4539572f928ddc9dad51c4e8 Mon Sep 17 00:00:00 2001 From: "Jung, Jin Hyuk" <12740762+salbang@users.noreply.github.com> Date: Thu, 30 Mar 2023 15:19:40 +0800 Subject: [PATCH] Fixed hash value on TIFF.cmake for ARM mac --- deps/TIFF/TIFF.cmake | 40 +++++++++++++++++++++++++++++----------- version.inc | 2 +- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index 3f925459e01..d8ef178b182 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -3,17 +3,35 @@ find_package(OpenGL QUIET REQUIRED) if (APPLE) message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.") - prusaslicer_add_cmake_project(TIFF - URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip - URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726 - DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG - CMAKE_ARGS - -Dlzma:BOOL=OFF - -Dwebp:BOOL=OFF - -Djbig:BOOL=OFF - -Dzstd:BOOL=OFF - -Dpixarlog:BOOL=OFF - ) + if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm") + prusaslicer_add_cmake_project(TIFF + URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip + URL_HASH SHA256=a1db6826ea1b8b08eaf168973abb29b8a143fb744c1b24cc6967cb12f5e6e81f + DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG + CMAKE_ARGS + -Dlzma:BOOL=OFF + -Dwebp:BOOL=OFF + -Djbig:BOOL=OFF + -Dzstd:BOOL=OFF + -Dpixarlog:BOOL=OFF + ) + + else() + + prusaslicer_add_cmake_project(TIFF + URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip + URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726 + DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG + CMAKE_ARGS + -Dlzma:BOOL=OFF + -Dwebp:BOOL=OFF + -Djbig:BOOL=OFF + -Dzstd:BOOL=OFF + -Dpixarlog:BOOL=OFF + ) + + endif() + else() prusaslicer_add_cmake_project(TIFF diff --git a/version.inc b/version.inc index 0e0a6ca068d..4c0654f1adc 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.5.59") set(SLIC3R_VERSION_FULL "2.5.59.2") -set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") +set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}_2023-03-30") set(SLIC3R_RC_VERSION "2,5,59,2") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")