diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-17 14:04:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-17 14:04:29 (GMT) |
| commit | b6e5b6485f17904597ffd94b05c4d493dd94947d (patch) | |
| tree | 82ac40628301b1d8e25c38813ae320c83c3173f1 /Modules/Platform | |
| parent | d657fd7b354710e26bf5aa9a72896897cb292c64 (diff) | |
| parent | e8bafb6fcbb46bad4dfcb8dab1347c8e5f9a8090 (diff) | |
| download | CMake-b6e5b6485f17904597ffd94b05c4d493dd94947d.zip CMake-b6e5b6485f17904597ffd94b05c4d493dd94947d.tar.gz CMake-b6e5b6485f17904597ffd94b05c4d493dd94947d.tar.bz2 | |
Merge branch 'osx-no-deployment-target-on-cross-compile' into release
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() |