From 7d98cc6d2b137431084daab082b31f0915faa5ef Mon Sep 17 00:00:00 2001 From: Aaron Barany Date: Mon, 4 Jul 2022 16:51:36 -0700 Subject: [PATCH] Force CMAKE_MACOSX_DEPLOYMENT_TARGET in CI for Mac builds. CI image appears to set it via an environment variable and overrides attempts to set it when running CMake. --- CMakeLists.txt | 4 ++-- azure-pipelines.yml | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 496966e..02e26dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,8 @@ set(CUTTLEFISH_INSTALL_PVRTEXLIB ON CACHE BOOL "Include the PVRTexTool library with the installation.") set(CUTTLEFISH_INSTALL_SET_RPATH ON CACHE BOOL "Set rpath for library and tool on installation.") -# PVRTexTool library requires 10.14 or higher. -if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) +if (APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) + # PVRTexTool library requires 10.14 or higher. set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14 CACHE STRING "Minimum macOS deployment version." FORCE) endif() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d5e90c2..b4c5dff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -129,22 +129,28 @@ jobs: matrix: static: lib.type: Static - cmake.args: -GXcode -DCUTTLEFISH_SHARED=OFF -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + cmake.args: >- + -GXcode -DCUTTLEFISH_SHARED=OFF -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 ispc: 0 shared: lib.type: Shared - cmake.args: -GXcode -DCUTTLEFISH_SHARED=ON -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + cmake.args: >- + -GXcode -DCUTTLEFISH_SHARED=ON -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 ispc: 0 static_ispc: lib.type: Static cmake.args: >- -GXcode -DCUTTLEFISH_SHARED=OFF -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCUTTLEFISH_ISPC_PATH=$(Build.SourcesDirectory)/ispc-v$(ispc.version)-macOS/bin/ispc ispc: 1 shared_ispc: lib.type: Shared cmake.args: >- -GXcode -DCUTTLEFISH_SHARED=ON -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCUTTLEFISH_ISPC_PATH=$(Build.SourcesDirectory)/ispc-v$(ispc.version)-macOS/bin/ispc ispc: 1 artifact: 1