[Cmake-commits] CMake branch, next, updated. v2.8.10-739-g4b28c61

[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  4b28c6123bdf4dfa0f415305b725835fa54164f9 (commit)
       via  fccf19f49b4a9f6ec71c226af1a99c97359b9a2e (commit)
      from  6a480dcb4ebdbe1df053e8887dabf523aeda0edc (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=4b28c6123bdf4dfa0f415305b725835fa54164f9
commit 4b28c6123bdf4dfa0f415305b725835fa54164f9
Merge: 6a480dc fccf19f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 5 08:39:48 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 5 08:39:48 2012 -0500

    Merge topic 'fix-PathScale-compiler-id' into next
    
    fccf19f Fix PathScale compiler id for Clang-based upstream


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fccf19f49b4a9f6ec71c226af1a99c97359b9a2e
commit fccf19f49b4a9f6ec71c226af1a99c97359b9a2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 5 08:33:54 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 5 08:33:54 2012 -0500

    Fix PathScale compiler id for Clang-based upstream
    
    Upstream PathScale now uses Clang as its front-end.  Test for __PATHCC__
    before __clang__.
    
    Reported-by: C. Bergström <cbergstrom at pathscale.com>

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index c5bde9a..2d76c7a 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -20,6 +20,14 @@
 #  define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
 # endif
 
+#elif defined(__PATHCC__)
+# define COMPILER_ID "PathScale"
+# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
+# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
+# if defined(__PATHCC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
+# endif
+
 #elif defined(__clang__)
 # define COMPILER_ID "Clang"
 # define COMPILER_VERSION_MAJOR DEC(__clang_major__)
@@ -95,14 +103,6 @@
 #  define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
 # endif
 
-#elif defined(__PATHCC__)
-# define COMPILER_ID "PathScale"
-# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
-# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
-# if defined(__PATHCC_PATCHLEVEL__)
-#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
-# endif
-
 #elif defined(_CRAYC)
 # define COMPILER_ID "Cray"
 # define COMPILER_VERSION_MAJOR DEC(_RELEASE)
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 2c8dd4b..5e70a41 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -25,6 +25,14 @@
 #  define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
 # endif
 
+#elif defined(__PATHCC__)
+# define COMPILER_ID "PathScale"
+# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
+# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
+# if defined(__PATHCC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
+# endif
+
 #elif defined(__clang__)
 # define COMPILER_ID "Clang"
 # define COMPILER_VERSION_MAJOR DEC(__clang_major__)
@@ -100,14 +108,6 @@
 #  define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
 # endif
 
-#elif defined(__PATHCC__)
-# define COMPILER_ID "PathScale"
-# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
-# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
-# if defined(__PATHCC_PATCHLEVEL__)
-#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
-# endif
-
 #elif defined(_CRAYC)
 # define COMPILER_ID "Cray"
 # define COMPILER_VERSION_MAJOR DEC(_RELEASE)

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in     |   16 ++++++++--------
 Modules/CMakeCXXCompilerId.cpp.in |   16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake