diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-27 13:08:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-27 13:08:15 (GMT) |
| commit | 07983bcbfa5e469bfdffbad6f670e68a87760792 (patch) | |
| tree | 61e1c2dcdbe42b40eb2a9b850f82fc70618d21cf /Modules | |
| parent | fdb474d456c5880b2a9274f7b45d4f5035e8ee0f (diff) | |
| parent | cffe0ed798d3ea7f5417d65ba52785105521aa53 (diff) | |
| download | CMake-07983bcbfa5e469bfdffbad6f670e68a87760792.zip CMake-07983bcbfa5e469bfdffbad6f670e68a87760792.tar.gz CMake-07983bcbfa5e469bfdffbad6f670e68a87760792.tar.bz2 | |
Merge topic 'osx-no-warn-sdk-target-mismatch'
cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index a08411b..91c2cf3 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -90,16 +90,6 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode endif() endforeach() - if(CMAKE_OSX_DEPLOYMENT_TARGET AND - NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL ${_CMAKE_OSX_DEPLOYMENT_TARGET}) - 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") - message(WARNING - "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " - "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n" - "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) |