[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3691-gdeaaba2

Brad King brad.king at kitware.com
Tue Aug 6 09:00:57 EDT 2013


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  deaaba2b2c2012fec53a7f6ab93e7b985dbd61fa (commit)
       via  2a0241a90a821fe334ea0942b6eb9d97605d9ed9 (commit)
      from  1b4d3bf95e2f1e37b3ac223ffab20175f996ebe9 (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=deaaba2b2c2012fec53a7f6ab93e7b985dbd61fa
commit deaaba2b2c2012fec53a7f6ab93e7b985dbd61fa
Merge: 1b4d3bf 2a0241a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 6 09:00:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 6 09:00:53 2013 -0400

    Merge topic 'osx-no-command-line-tools' into next
    
    2a0241a OS X: Ask Xcode for compiler only if it is NOTFOUND


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a0241a90a821fe334ea0942b6eb9d97605d9ed9
commit 2a0241a90a821fe334ea0942b6eb9d97605d9ed9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 6 08:56:30 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 6 08:56:30 2013 -0400

    OS X: Ask Xcode for compiler only if it is NOTFOUND
    
    If the user explicitly sets CMAKE_<LANG>_COMPILER to an empty string
    then honor it instead of asking Xcode for a compiler.

diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake
index 1763c96..f522c44 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -71,7 +71,7 @@ macro(_cmake_find_compiler lang)
   unset(_languages)
 
   # Look for a make tool provided by Xcode
-  if(NOT CMAKE_${lang}_COMPILER AND CMAKE_HOST_APPLE)
+  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

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

Summary of changes:
 Modules/CMakeDetermineCompiler.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list