mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor SDK name to path into a function

Browse Source
This commit is contained in:
Cristian Adam
2019-12-11 11:55:46 +01:00
parent 777d364913
commit 7a44e16d7f
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,18 @@ endforeach()
set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE ${_CMAKE_OSX_SYSROOT_TYPE} set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE ${_CMAKE_OSX_SYSROOT_TYPE}
"The product will be built against the headers and libraries located inside the indicated SDK.") "The product will be built against the headers and libraries located inside the indicated SDK.")
# Transform the cached value to something we can use. # Resolves the SDK name into a path
function(_apple_resolve_sdk_path sdk_name ret)
execute_process(
COMMAND xcrun -sdk ${sdk_name} --show-sdk-path
OUTPUT_VARIABLE _stdout
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE _stderr
RESULT_VARIABLE _failed
)
set(${ret} "${_stdout}" PARENT_SCOPE)
endfunction()
set(_CMAKE_OSX_SYSROOT_PATH "") set(_CMAKE_OSX_SYSROOT_PATH "")
if(CMAKE_OSX_SYSROOT) if(CMAKE_OSX_SYSROOT)
if("x${CMAKE_OSX_SYSROOT}" MATCHES "/") if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")
@@ -134,16 +145,9 @@ if(CMAKE_OSX_SYSROOT)
endif() endif()
set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
else() else()
# Transform the sdk name into a path. _apple_resolve_sdk_path(${CMAKE_OSX_SYSROOT} _sdk_path)
execute_process( if(IS_DIRECTORY "${_sdk_path}")
COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} --show-sdk-path set(_CMAKE_OSX_SYSROOT_PATH "${_sdk_path}")
OUTPUT_VARIABLE _stdout
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE _stderr
RESULT_VARIABLE _failed
)
if(NOT _failed AND IS_DIRECTORY "${_stdout}")
set(_CMAKE_OSX_SYSROOT_PATH "${_stdout}")
# For non-Xcode generators use the path. # For non-Xcode generators use the path.
if(NOT "${CMAKE_GENERATOR}" MATCHES "Xcode") if(NOT "${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}") set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}")