OS X: Enable command-line build without tools in PATH
Teach modules CMakeDetermineCompiler and CMakeUnixFindMake to ask Xcode where to find the compiler or make tools, using 'xcrun --find', if none is found in the PATH. Teach module Platform/Darwin to add the path to the SDK to CMAKE_SYSTEM_PREFIX_PATH so that find_* command look there. Also add the SDK /usr/include directory to the implicit include list in CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES to suppress explicit -I options for it.
This commit is contained in:
parent
bf5a5bc8b4
commit
03ab170fe0
|
@ -69,4 +69,17 @@ macro(_cmake_find_compiler lang)
|
|||
endif()
|
||||
unset(_${lang}_COMPILER_HINTS)
|
||||
unset(_languages)
|
||||
|
||||
# Look for a make tool provided by Xcode
|
||||
if(CMAKE_${lang}_COMPILER STREQUAL "CMAKE_${lang}_COMPILER-NOTFOUND" AND CMAKE_HOST_APPLE)
|
||||
foreach(comp ${CMAKE_${lang}_COMPILER_LIST})
|
||||
execute_process(COMMAND xcrun --find ${comp}
|
||||
OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_VARIABLE _xcrun_err)
|
||||
if(_xcrun_out)
|
||||
set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${_xcrun_out}")
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
endmacro()
|
||||
|
|
|
@ -14,3 +14,13 @@
|
|||
|
||||
find_program(CMAKE_MAKE_PROGRAM NAMES gmake make smake)
|
||||
mark_as_advanced(CMAKE_MAKE_PROGRAM)
|
||||
|
||||
# Look for a make tool provided by Xcode
|
||||
if(NOT CMAKE_MAKE_PROGRAM AND CMAKE_HOST_APPLE)
|
||||
execute_process(COMMAND xcrun --find make
|
||||
OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_VARIABLE _xcrun_err)
|
||||
if(_xcrun_out)
|
||||
set_property(CACHE CMAKE_MAKE_PROGRAM PROPERTY VALUE "${_xcrun_out}")
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -326,6 +326,12 @@ set(CMAKE_SYSTEM_APPBUNDLE_PATH
|
|||
unset(_apps_paths)
|
||||
|
||||
include(Platform/UnixPaths)
|
||||
if(_CMAKE_OSX_SYSROOT_PATH AND EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
|
||||
foreach(lang C CXX)
|
||||
list(APPEND CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
|
||||
endforeach()
|
||||
endif()
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
/sw # Fink
|
||||
/opt/local # MacPorts
|
||||
|
|
Loading…
Reference in New Issue