From 079f6594e322c81d258d5abc7de2bda82b411558 Mon Sep 17 00:00:00 2001 From: Giuseppe Sorrentino Date: Wed, 28 Feb 2024 18:16:12 +0100 Subject: [PATCH] apple silicon build fix --- .github/workflows/ccpp_mac_arm.yml | 2 +- .github/workflows/ccpp_mac_arm_debug.yml | 2 +- .github/workflows/ccpp_mac_arm_rc.yml | 2 +- CMakeLists.txt | 1 + deps/TIFF/TIFF.cmake | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ccpp_mac_arm.yml b/.github/workflows/ccpp_mac_arm.yml index 710e70a29e1..090671cc17d 100644 --- a/.github/workflows/ccpp_mac_arm.yml +++ b/.github/workflows/ccpp_mac_arm.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: macos-11 + runs-on: macos-14 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ccpp_mac_arm_debug.yml b/.github/workflows/ccpp_mac_arm_debug.yml index eabd6ecd364..10b4e1ce387 100644 --- a/.github/workflows/ccpp_mac_arm_debug.yml +++ b/.github/workflows/ccpp_mac_arm_debug.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-11 + runs-on: macos-14 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/ccpp_mac_arm_rc.yml b/.github/workflows/ccpp_mac_arm_rc.yml index 9cc5bd1df7c..5b68de5f80c 100644 --- a/.github/workflows/ccpp_mac_arm_rc.yml +++ b/.github/workflows/ccpp_mac_arm_rc.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-11 + runs-on: macos-14 steps: - uses: actions/checkout@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 18f26baf813..a112949bba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,6 +206,7 @@ if(WIN32) endif() if (APPLE) + add_compile_options(-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}") if (CMAKE_OSX_DEPLOYMENT_TARGET) message("OS X Deployment Target: ${CMAKE_OSX_DEPLOYMENT_TARGET}") diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index d8ef178b182..3948239fb30 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -6,7 +6,7 @@ if (APPLE) 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 + URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726 DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG CMAKE_ARGS -Dlzma:BOOL=OFF