diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3eafdfb92..f49422551 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -104,12 +104,12 @@ jobs: - name: "macos-14-arm64" runs-on: macos-14 timeout: 10 - config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' + config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' - name: "macos-14-x64" runs-on: macos-14-large timeout: 20 - config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' + config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' - name: "debian-13-x86_64" runs-on: ubuntu-latest diff --git a/CMakeLists.txt b/CMakeLists.txt index 554b98eda..10eda5773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,11 +147,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") add_definitions(-DNDEBUG) endif() -# Set required macOS SDK -if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET 12) -endif() - # Set Output Folders set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")