diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-29 12:52:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-29 12:52:13 (GMT) |
| commit | e8698861c69c3159aaa353af1e016aa7a387283a (patch) | |
| tree | 7bd0ffded45ddf6b94b41679902f3b3a11143aef /Modules | |
| parent | 35746899a32de0b4f4ee2c0586d399a06b633421 (diff) | |
| parent | 5b4faeefe36fd775fd60f98aedf0cc35202f99f4 (diff) | |
| download | CMake-e8698861c69c3159aaa353af1e016aa7a387283a.zip CMake-e8698861c69c3159aaa353af1e016aa7a387283a.tar.gz CMake-e8698861c69c3159aaa353af1e016aa7a387283a.tar.bz2 | |
Merge topic 'osx-no-sysroot-for-deployment'
5b4faeef OS X: Allow deployment target with "/" sysroot (#15040)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index e25df1e..e5c5f36 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -70,6 +70,8 @@ if(CMAKE_OSX_DEPLOYMENT_TARGET) set(_sdk_ver "${CMAKE_MATCH_1}") elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$") set(_sdk_ver "${CMAKE_MATCH_1}") + elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/") + set(_sdk_ver "${_CURRENT_OSX_VERSION}") else() message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " |