mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Always pick latest SDK if user has not set one explicitly

Browse Source 
Apple tech note QA1806 recommends always building against the latest
SDK.

Fixes: #20949
This commit is contained in:
Tor Arne Vestbø
2020-07-14 14:16:31 +02:00
parent 8e7922e382
commit 17e13fb6d0
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Help/release/dev/macOS-sdk-latest.rst Normal file
View File

@@ -0,0 +1,10 @@
macOS-sdk-latest
----------------
* Building for macOS will now use the latest SDK available on the system,
unless the user has explicitly chosen a SDK using :variable:`CMAKE_OSX_SYSROOT`.
The deployment target or system macOS version will not affect
the choice of SDK.
* macOS SDKs older than 10.5 are no longer supported.

33
Modules/Platform/Darwin-Initialize.cmake
View File

@@ -72,35 +72,26 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
endif() endif()
if(_CMAKE_OSX_SDKS_DIR) if(_CMAKE_OSX_SDKS_DIR)
# Select SDK for current OSX version accounting for the known # Find the latest SDK as recommended by Apple (Technical Q&A QA1806)
# specially named SDKs.
set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.4 "u")
set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.3 ".9")
# find the latest SDK
set(_CMAKE_OSX_LATEST_SDK_VERSION "0.0") set(_CMAKE_OSX_LATEST_SDK_VERSION "0.0")
file(GLOB _CMAKE_OSX_SDKS RELATIVE "${_CMAKE_OSX_SDKS_DIR}" "${_CMAKE_OSX_SDKS_DIR}/MacOSX*.sdk") file(GLOB _CMAKE_OSX_SDKS RELATIVE "${_CMAKE_OSX_SDKS_DIR}" "${_CMAKE_OSX_SDKS_DIR}/MacOSX*.sdk")
foreach(_SDK ${_CMAKE_OSX_SDKS}) foreach(_SDK ${_CMAKE_OSX_SDKS})
if(_SDK MATCHES "MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk" AND CMAKE_MATCH_1 VERSION_GREATER ${_CMAKE_OSX_LATEST_SDK_VERSION}) if(IS_DIRECTORY "${_CMAKE_OSX_SDKS_DIR}/${_SDK}"
AND _SDK MATCHES "MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk"
AND CMAKE_MATCH_1 VERSION_GREATER ${_CMAKE_OSX_LATEST_SDK_VERSION})
set(_CMAKE_OSX_LATEST_SDK_VERSION "${CMAKE_MATCH_1}") set(_CMAKE_OSX_LATEST_SDK_VERSION "${CMAKE_MATCH_1}")
endif() endif()
endforeach() endforeach()
# pick an SDK that works if(NOT _CMAKE_OSX_LATEST_SDK_VERSION STREQUAL "0.0")
set(_CMAKE_OSX_SYSROOT_DEFAULT) set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_LATEST_SDK_VERSION}.sdk")
foreach(_ver ${CMAKE_OSX_DEPLOYMENT_TARGET} else()
${_CURRENT_OSX_VERSION} message(WARNING "Could not find any valid SDKs in ${_CMAKE_OSX_SDKS_DIR}")
${_CMAKE_OSX_LATEST_SDK_VERSION}) endif()
set(_CMAKE_OSX_DEPLOYMENT_TARGET ${_ver})
set(_CMAKE_OSX_SDKS_VER ${_CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CMAKE_OSX_DEPLOYMENT_TARGET}})
set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_CHECK}")
set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SYSROOT_CHECK}")
break()
endif()
endforeach()
if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET) if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_DEPLOYMENT_TARGET
AND (_CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_LATEST_SDK_VERSION
OR _CMAKE_OSX_LATEST_SDK_VERSION STREQUAL "0.0"))
set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
"Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value." FORCE) "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value." FORCE)
endif() endif()