[Cmake-commits] CMake branch, next, updated. v2.8.8-3603-gba7ebeb
Brad King
brad.king at kitware.com
Tue Jul 31 15:40:43 EDT 2012
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 ba7ebeba4c0da2a04dd3455982c10a6d8b9484b8 (commit)
via 27b74445b49cee310ad0951b1cb3bdb0645b95f4 (commit)
via b708f1a2b9bc82ada6a22f6c63d9fb6ccedb2862 (commit)
via aa3dbec57d07dd22718c3860d0c0e1b49f15a3ba (commit)
from 078b8b15f78e05f80b196c2f02405ff7137ba571 (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=ba7ebeba4c0da2a04dd3455982c10a6d8b9484b8
commit ba7ebeba4c0da2a04dd3455982c10a6d8b9484b8
Merge: 078b8b1 27b7444
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 31 15:40:38 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 31 15:40:38 2012 -0400
Merge topic 'select-compiler' into next
27b7444 CMakeDetermine(C|CXX)Compiler: Prefer generic system compilers
b708f1a CMakeDetermine(C|CXX)Compiler: Consider Clang compilers
aa3dbec CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27b74445b49cee310ad0951b1cb3bdb0645b95f4
commit 27b74445b49cee310ad0951b1cb3bdb0645b95f4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 31 15:33:43 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 31 15:33:43 2012 -0400
CMakeDetermine(C|CXX)Compiler: Prefer generic system compilers
Teach CMake to prefer the system default compiler automatically. Look
for system compilers with generic names before GNU-specific names.
Other vendor-specific names already have lower priority.
C: Prefer "cc" before GNU "gcc"
C++: Prefer "CC" before "c++" or GNU "g++"
This will change the default compiler selection for existing build
scripts that do not specify a compiler when run on machines with
separate system and GNU compilers both installed in the PATH.
We do not make this change in default behavior lightly. Howerver:
(1) If a given build really needs specific compilers one should specify
them explicitly e.g. by setting CC and CXX in the environment.
(2) The motivating case is to prefer the system Clang on OS X machines
over the older GNU compilers typically also installed. On newer
OS X versions the name "c++" links to Clang so the old behavior
picked Clang for C++ and GNU for C by default.
(3) Other than the motivating OS X case the conditions under which the
behavior changes do not tend to exist in default OS installations.
They typically occur only on non-GNU systems with manually-installed
GNU compilers.
(4) The consequences of the new behavior are not dire. At worst the
project fails to compile with the system compiler when it previously
worked with the non-system GNU compiler. Such failure is easy to
work around (see #1).
In short this change fixes default behavior on a widely-used platform
at the cost of a modest change in behavior in less-common conditions.
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index 5c7bec5..f7eece8 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}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc clang)
+ SET(CMAKE_C_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}cc ${_CMAKE_TOOLCHAIN_PREFIX}gcc cl bcc xlc clang)
ENDIF(CMAKE_C_COMPILER_INIT)
# Find the compiler.
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index f78d7a7..ad8469a 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}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC clang++)
+ SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}CC ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ aCC cl bcc xlC clang++)
ENDIF(CMAKE_CXX_COMPILER_INIT)
# Find the compiler.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b708f1a2b9bc82ada6a22f6c63d9fb6ccedb2862
commit b708f1a2b9bc82ada6a22f6c63d9fb6ccedb2862
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 31 14:26:43 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 31 14:30:30 2012 -0400
CMakeDetermine(C|CXX)Compiler: Consider Clang compilers
Look for "clang" or "clang++" compiler executables so Clang will be used
when it is the only compiler available. Prefer them last to avoid
changing compiler default preferences for existing scripts.
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index 9028e8e..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}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc)
+ 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 7f8f3ec..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}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC)
+ 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 +-
Source/CMakeVersion.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list