[Cmake-commits] CMake branch, next, updated. v2.8.8-3605-g4d249b3

[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  4d249b382de608360b367e8029bae70cb0318bf9 (commit)
       via  ea56c232619e249650f7211c0ea2e75b89b9a243 (commit)
      from  ba7ebeba4c0da2a04dd3455982c10a6d8b9484b8 (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=4d249b382de608360b367e8029bae70cb0318bf9
commit 4d249b382de608360b367e8029bae70cb0318bf9
Merge: ba7ebeb ea56c23
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 1 08:52:35 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 1 08:52:35 2012 -0400

    Merge topic 'select-compiler' into next
    
    ea56c23 Revert "CMakeDetermine(C|CXX)Compiler: Prefer generic system compilers"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea56c232619e249650f7211c0ea2e75b89b9a243
commit ea56c232619e249650f7211c0ea2e75b89b9a243
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 1 08:46:28 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 1 08:46:28 2012 -0400

    Revert "CMakeDetermine(C|CXX)Compiler: Prefer generic system compilers"
    
    This reverts commit 27b74445b49cee310ad0951b1cb3bdb0645b95f4.
    
    On case-insensitive OS X filesystems using "CC" as the C++ compiler
    acts as a C compiler when generating the link line and does not add
    the -lstdc++ library.  However, if we prefer "cc" for C and "c++"
    then on platforms with non-GNU system compilers named "cc" and "CC"
    and a GNU compiler installed named "c++" we will get mixed-vendor
    selection.  Another solution will be needed to avoid mixing old GNU
    and new Clang on OS X.

diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index f7eece8..5c7bec5 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -56,7 +56,7 @@ IF(NOT CMAKE_C_COMPILER)
   IF(CMAKE_C_COMPILER_INIT)
     SET(CMAKE_C_COMPILER_LIST ${CMAKE_C_COMPILER_INIT})
   ELSE(CMAKE_C_COMPILER_INIT)
-    SET(CMAKE_C_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}cc ${_CMAKE_TOOLCHAIN_PREFIX}gcc cl bcc xlc clang)
+    SET(CMAKE_C_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc clang)
   ENDIF(CMAKE_C_COMPILER_INIT)
 
   # Find the compiler.
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index ad8469a..f78d7a7 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -55,7 +55,7 @@ IF(NOT CMAKE_CXX_COMPILER)
   IF(CMAKE_CXX_COMPILER_INIT)
     SET(CMAKE_CXX_COMPILER_LIST ${CMAKE_CXX_COMPILER_INIT})
   ELSE(CMAKE_CXX_COMPILER_INIT)
-    SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}CC ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ aCC cl bcc xlC clang++)
+    SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC clang++)
   ENDIF(CMAKE_CXX_COMPILER_INIT)
 
   # Find the compiler.

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

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


hooks/post-receive
-- 
CMake