diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-26 17:20:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-26 17:20:14 (GMT) |
| commit | 1a5fddfe6d56733528ace3d15899b0739ea28054 (patch) | |
| tree | 5c1e4f91268245826f335de7f78979f49d5e44ca | |
| parent | a721830767c6a7819ed82cda5f910b732201f885 (diff) | |
| parent | 540815eec2b83a8b43689580c54e8950d9f5868b (diff) | |
| download | CMake-1a5fddfe6d56733528ace3d15899b0739ea28054.zip CMake-1a5fddfe6d56733528ace3d15899b0739ea28054.tar.gz CMake-1a5fddfe6d56733528ace3d15899b0739ea28054.tar.bz2 | |
Merge topic 'xcode-sdk-version'
540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 91c2cf3..427909d 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT) set(_CMAKE_OSX_SYSROOT_ORIG "") endif() set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") - else() - # Transform the sdk name into a path. + endif() + + if(CMAKE_OSX_SYSROOT) + # Transform the (maybe unversioned) sysroot into a versioned path. execute_process( COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path OUTPUT_VARIABLE _stdout |