From 1e0b5b5c68e146a902a007aedbea784299c0b50f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 2 Jan 2024 13:13:22 +0800 Subject: [PATCH] Set CMAKE_OSX_DEPLOYMENT_TARGET properly on dev machine when calling build_release_mac.sh (cherry picked from commit 8d5bb6cc4b60c335afc3a6597e66fd9f63349ccc) --- CMakeLists.txt | 3 ++- deps/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa53ba06ec8..c530a9c3fb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.13) if (APPLE) # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3 if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) endif () + message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}") endif () project(OrcaSlicer) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 4352668633e..8b693b28cc0 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -24,8 +24,10 @@ cmake_minimum_required(VERSION 3.2) if (APPLE) # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3 if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) endif () + message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}") + endif () project(OrcaSlicer-deps)