[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3693-g2a18adb

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2a18adb84108878563871539073d6cc0bb4bfb73 (commit)
       via  03ab170fe0ad8fa44083dc2e2a6f662be480c9ff (commit)
      from  deaaba2b2c2012fec53a7f6ab93e7b985dbd61fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a18adb84108878563871539073d6cc0bb4bfb73
commit 2a18adb84108878563871539073d6cc0bb4bfb73
Merge: deaaba2 03ab170
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 6 09:04:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 6 09:04:14 2013 -0400

    Merge topic 'osx-no-command-line-tools' into next
    
    03ab170 OS X: Enable command-line build without tools in PATH


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03ab170fe0ad8fa44083dc2e2a6f662be480c9ff
commit 03ab170fe0ad8fa44083dc2e2a6f662be480c9ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 5 13:48:09 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 6 09:00:18 2013 -0400

    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.

diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake
index 2d12c07..f522c44 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -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()
diff --git a/Modules/CMakeUnixFindMake.cmake b/Modules/CMakeUnixFindMake.cmake
index c75cf7c..3714926 100644
--- a/Modules/CMakeUnixFindMake.cmake
+++ b/Modules/CMakeUnixFindMake.cmake
@@ -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()
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 865cc8e..db8c7ef 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -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

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake