[Cmake-commits] CMake branch, next, updated. v2.8.1-1215-g847a795

[cmake-commits at cmake.org]

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  847a79544d7ac3ee708386ef12f40b336047003e (commit)
       via  571dc7489111893355deba710feee5990bce92e4 (commit)
      from  e6cd880381ec536be277da3b590b5f326b848e1f (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=847a79544d7ac3ee708386ef12f40b336047003e
commit 847a79544d7ac3ee708386ef12f40b336047003e
Merge: e6cd880 571dc74
Author: Brad King <brad.king at kitware.com>
Date:   Mon May 17 14:13:07 2010 -0400

    Merge branch 'clang' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=571dc7489111893355deba710feee5990bce92e4
commit 571dc7489111893355deba710feee5990bce92e4
Author: Brad King <brad.king at kitware.com>
Date:   Mon May 17 14:11:20 2010 -0400

    Recognize Clang C and C++ compilers (see #10693)
    
    Map to the platform and compiler information for GNU because the
    compilers are command-line compatible for common operations.  Later we
    can add Clang-specific features as necessary.  We honor the preferred
    capitalization is "Clang", not the common mis-spelling "CLang".

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 5d004c7..accda32 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -9,6 +9,9 @@
 #if defined(__INTEL_COMPILER) || defined(__ICC)
 # define COMPILER_ID "Intel"
 
+#elif defined(__clang__)
+# define COMPILER_ID "Clang"
+
 #elif defined(__BORLANDC__)
 # define COMPILER_ID "Borland"
 
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 00ab8e2..4a32823 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -11,6 +11,9 @@
 #elif defined(__INTEL_COMPILER) || defined(__ICC)
 # define COMPILER_ID "Intel"
 
+#elif defined(__clang__)
+# define COMPILER_ID "Clang"
+
 #elif defined(__BORLANDC__)
 # define COMPILER_ID "Borland"
 
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
new file mode 100644
index 0000000..f7baf68
--- /dev/null
+++ b/Modules/Compiler/Clang-C.cmake
@@ -0,0 +1 @@
+include(Compiler/GNU-C)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
new file mode 100644
index 0000000..d3c403a
--- /dev/null
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -0,0 +1 @@
+include(Compiler/GNU-CXX)
diff --git a/Modules/Platform/Linux-Clang-C.cmake b/Modules/Platform/Linux-Clang-C.cmake
new file mode 100644
index 0000000..dbf8956
--- /dev/null
+++ b/Modules/Platform/Linux-Clang-C.cmake
@@ -0,0 +1 @@
+INCLUDE(Platform/Linux-GNU-C)
diff --git a/Modules/Platform/Linux-Clang-CXX.cmake b/Modules/Platform/Linux-Clang-CXX.cmake
new file mode 100644
index 0000000..8fe251c
--- /dev/null
+++ b/Modules/Platform/Linux-Clang-CXX.cmake
@@ -0,0 +1 @@
+INCLUDE(Platform/Linux-GNU-CXX)

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in          |    3 +++
 Modules/CMakeCXXCompilerId.cpp.in      |    3 +++
 Modules/Compiler/Clang-C.cmake         |    1 +
 Modules/Compiler/Clang-CXX.cmake       |    1 +
 Modules/Platform/Linux-Clang-C.cmake   |    1 +
 Modules/Platform/Linux-Clang-CXX.cmake |    1 +
 6 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 Modules/Compiler/Clang-C.cmake
 create mode 100644 Modules/Compiler/Clang-CXX.cmake
 create mode 100644 Modules/Platform/Linux-Clang-C.cmake
 create mode 100644 Modules/Platform/Linux-Clang-CXX.cmake


hooks/post-receive
-- 
CMake