From 36d3524daf46adec7c723dc29beedccbc2bb819f Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Mon, 30 Nov 2020 19:13:15 +0100 Subject: [PATCH] cmake: set CMAKE_OSX_DEPLOYMENT_TARGET in ci.yml --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 2 -- app/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e120e18fa..c30f0d6ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -359,7 +359,7 @@ jobs: working-directory: ${{ runner.workspace }}/build run: | PATH=$GITHUB_WORKSPACE:$PATH \ - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" + cmake $GITHUB_WORKSPACE -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" - name: Build working-directory: ${{ runner.workspace }}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b6312bec..778bda302 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") - set(OLIVE_DEFINITIONS -DAPPVERSION="${PROJECT_VERSION}" -DQT_DEPRECATED_WARNINGS) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3eb4272a2..b7331ca43 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -89,8 +89,6 @@ if(APPLE) RESOURCE "${OLIVE_ICON}" OUTPUT_NAME "Olive" ) - - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") endif() # Set compiler options