From e927408047f5a2323bd08073a73e515c02c39107 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 Oct 2025 17:06:33 -0400 Subject: [PATCH] Apple: Initialize deployment target after SDK --- Modules/Platform/Darwin-Initialize.cmake | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 196ab18b0b..09d02a74c7 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -15,12 +15,6 @@ else() set(OSX_DEVELOPER_ROOT "") endif() -if(NOT CMAKE_CROSSCOMPILING) - execute_process(COMMAND sw_vers -productVersion - OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) -endif() - # Save CMAKE_OSX_ARCHITECTURES from the environment. set(CMAKE_OSX_ARCHITECTURES "$ENV{CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Build architectures for OSX") @@ -49,15 +43,6 @@ endif() # Platform/Apple-${CMAKE_CXX_COMPILER_ID}- set(CMAKE_EFFECTIVE_SYSTEM_NAME "Apple") -#---------------------------------------------------------------------------- -# CMAKE_OSX_DEPLOYMENT_TARGET - -# Set cache variable - end user may change this during ccmake or cmake-gui configure. -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING - "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") -endif() - #---------------------------------------------------------------------------- # CMAKE_OSX_SYSROOT @@ -296,3 +281,18 @@ if(NOT CMAKE_OSX_SYSROOT) /usr/local/lib ) endif() + +#---------------------------------------------------------------------------- +# CMAKE_OSX_DEPLOYMENT_TARGET + +if(NOT CMAKE_CROSSCOMPILING) + execute_process(COMMAND sw_vers -productVersion + OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() + +# Set cache variable - end user may change this during ccmake or cmake-gui configure. +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING + "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") +endif()