diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2016-10-31 09:29:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-01 13:37:49 (GMT) |
| commit | 935041908db878163ab03f175b992981fc4b8ff3 (patch) | |
| tree | 1d61d907cf546829b96264cdaa28db0d94ae3757 /Modules/Platform/Darwin-Initialize.cmake | |
| parent | 542d52f95e3540953113fc66dc7a7958b9c184de (diff) | |
| download | CMake-935041908db878163ab03f175b992981fc4b8ff3.zip CMake-935041908db878163ab03f175b992981fc4b8ff3.tar.gz CMake-935041908db878163ab03f175b992981fc4b8ff3.tar.bz2 | |
Darwin: Remove deployment target version check
Starting with Xcode 8 the SDK folder also contains an unversioned entry:
MacOSX.sdk
MacOSX10.12.sdk -> MacOSX.sdk
If this unversioned path is used CMake cannot detect the SDK version.
Furthermore, querying the SDK version via
xcodebuild -sdk <sysroot> -version Path
gives bogus results for the Command Line Tools installed into `/`.
The OS X deployment target version and SDK version are not as tied as
they once were, so this check is now more trouble than it is worth.
Simply remove it.
Closes: #16323
Diffstat (limited to 'Modules/Platform/Darwin-Initialize.cmake')
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 3606144..b539e45 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -113,7 +113,6 @@ set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE ${_CMAKE_OSX_SYSROOT "The product will be built against the headers and libraries located inside the indicated SDK.") # Transform the cached value to something we can use. -set(_CMAKE_OSX_SYSROOT_ORIG "${CMAKE_OSX_SYSROOT}") set(_CMAKE_OSX_SYSROOT_PATH "") if(CMAKE_OSX_SYSROOT) if("x${CMAKE_OSX_SYSROOT}" MATCHES "/") @@ -122,7 +121,6 @@ if(CMAKE_OSX_SYSROOT) message(WARNING "Ignoring CMAKE_OSX_SYSROOT value:\n ${CMAKE_OSX_SYSROOT}\n" "because the directory does not exist.") set(CMAKE_OSX_SYSROOT "") - set(_CMAKE_OSX_SYSROOT_ORIG "") endif() set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") else() |