From 80c886ce98a877f7bcf1e12e37e9dd872445e4ae 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 + 4 files changed, 4 insertions(+), 3 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}")