From b4032a775118b5c42ca81afe2ddd351c21a6c60b Mon Sep 17 00:00:00 2001 From: Emily Mabrey Date: Tue, 14 Sep 2021 14:42:10 -0400 Subject: [PATCH] Move MACOSX_DEPLOYMENT_TARGET initialization Stop setting it globally and make it wxwidgets build specific Use CMAKE_OSX_DEPLOYMENT_TARGET instead of the env var name Signed-off-by: Emily Mabrey --- .github/workflows/cmake_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index de24d96d9..b62f2f2c0 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -114,7 +114,6 @@ jobs: env: AUDACITY_ARCH_LABEL: ${{ matrix.config.arch }} - MACOSX_DEPLOYMENT_TARGET: 10.12 # CMake settings CMAKE_BUILD_TYPE: MinSizeRel @@ -271,7 +270,7 @@ jobs: git clone --recurse-submodules ${{ env.WX_GIT_URL }} cd wxWidgets git checkout ${{ env.WX_GIT_REF }} - cmake -S . -B cmake_build -D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -D CMAKE_INSTALL_PREFIX=${{ env.WX_INSTALL_DIR }} + cmake -S . -B cmake_build -D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -D CMAKE_INSTALL_PREFIX=${{ env.WX_INSTALL_DIR }} -D CMAKE_OSX_DEPLOYMENT_TARGET=10.12 cmake --build cmake_build cmake --install cmake_build