diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-12 19:51:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-12 19:51:15 (GMT) |
| commit | f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (patch) | |
| tree | e0390b86710b578f4039580ee3eab57d1c08c628 | |
| parent | 4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (diff) | |
| parent | 24aafbde115647b7e599d112d0bcc4f03c3e9b88 (diff) | |
| download | CMake-f13030cb5bdf6f91abf0e625fa0b4d2993ca4217.zip CMake-f13030cb5bdf6f91abf0e625fa0b4d2993ca4217.tar.gz CMake-f13030cb5bdf6f91abf0e625fa0b4d2993ca4217.tar.bz2 | |
Merge branch 'xcode-adjust-deployment-to-host-version' into release
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 4 |
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 "") |