kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'xcode-sdk-version' 

540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
This commit is contained in:
Brad King 2016-09-26 13:20:14 -04:00 committed by CMake Topic Stage
parent a721830767 540815eec2
commit 1a5fddfe6d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Platform/Darwin-Initialize.cmake
View File

@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT)
set(_CMAKE_OSX_SYSROOT_ORIG "") set(_CMAKE_OSX_SYSROOT_ORIG "")
endif() endif()
set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
else() endif()
# Transform the sdk name into a path.
if(CMAKE_OSX_SYSROOT)
# Transform the (maybe unversioned) sysroot into a versioned path.
execute_process( execute_process(
COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
OUTPUT_VARIABLE _stdout OUTPUT_VARIABLE _stdout