diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-17 14:15:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-17 14:15:02 (GMT) |
| commit | 69be82394dcd9044c9aa392e0aa078a6e09ec460 (patch) | |
| tree | 46bd7008c8d232d1fc3f1204b42f24e6689c1ce5 /Modules/Platform | |
| parent | 5fdee6d402798545280f8dc2955b21d4fe61605c (diff) | |
| parent | e8bafb6fcbb46bad4dfcb8dab1347c8e5f9a8090 (diff) | |
| download | CMake-69be82394dcd9044c9aa392e0aa078a6e09ec460.zip CMake-69be82394dcd9044c9aa392e0aa078a6e09ec460.tar.gz CMake-69be82394dcd9044c9aa392e0aa078a6e09ec460.tar.bz2 | |
Merge topic 'osx-no-deployment-target-on-cross-compile'
e8bafb6f OS X: Do not try to set deployment target when cross-compiling
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 427909d..39374e1 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -90,7 +90,7 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode endif() endforeach() - if(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_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() |