Merge topic 'osx-no-command-line-tools'

03ab170 OS X: Enable command-line build without tools in PATH
This commit is contained in:
Brad King 2013-08-07 08:21:24 -04:00 committed by CMake Topic Stage
commit fc657ef4d3
3 changed files with 29 additions and 0 deletions

View File

@ -69,4 +69,17 @@ macro(_cmake_find_compiler lang)
endif() endif()
unset(_${lang}_COMPILER_HINTS) unset(_${lang}_COMPILER_HINTS)
unset(_languages) 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() endmacro()

View File

@ -14,3 +14,13 @@
find_program(CMAKE_MAKE_PROGRAM NAMES gmake make smake) find_program(CMAKE_MAKE_PROGRAM NAMES gmake make smake)
mark_as_advanced(CMAKE_MAKE_PROGRAM) 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()

View File

@ -326,6 +326,12 @@ set(CMAKE_SYSTEM_APPBUNDLE_PATH
unset(_apps_paths) unset(_apps_paths)
include(Platform/UnixPaths) 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 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
/sw # Fink /sw # Fink
/opt/local # MacPorts /opt/local # MacPorts