summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-13 17:50:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-13 17:50:54 (GMT)
commit242d664f748baad810ae47aef91fc11475647f98 (patch)
treec42166a46a18b941588ee7d5992fd3d3d9d26255
parent3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (diff)
parent24aafbde115647b7e599d112d0bcc4f03c3e9b88 (diff)
downloadCMake-242d664f748baad810ae47aef91fc11475647f98.zip
CMake-242d664f748baad810ae47aef91fc11475647f98.tar.gz
CMake-242d664f748baad810ae47aef91fc11475647f98.tar.bz2
Merge topic 'xcode-adjust-deployment-to-host-version'
24aafbde Xcode: Adjust deployment target SDK version to host version
-rw-r--r--Modules/Platform/Darwin-Initialize.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 62fb985..a08411b 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -100,6 +100,10 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
"Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
)
endif()
+ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
+ 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)
+ endif()
else()
# Assume developer files are in root (such as Xcode 4.5 command-line tools).
set(_CMAKE_OSX_SYSROOT_DEFAULT "")