[Cmake-commits] CMake branch, next, updated. v2.8.7-2044-gf2cd42b

[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  f2cd42b2827008a0a4620885afa91e2681899d66 (commit)
       via  73ffc539623920e6cd3a00a5d5d4fdf0c6223e5a (commit)
      from  30a3a1a72bd745ac7da3c9d5f91894eab3d7b9e6 (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=f2cd42b2827008a0a4620885afa91e2681899d66
commit f2cd42b2827008a0a4620885afa91e2681899d66
Merge: 30a3a1a 73ffc53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 11:58:58 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 11:58:58 2012 -0500

    Merge topic 'compiler-version' into next
    
    73ffc53 Fix SunPro version detection for two-digit minor version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73ffc539623920e6cd3a00a5d5d4fdf0c6223e5a
commit 73ffc539623920e6cd3a00a5d5d4fdf0c6223e5a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 11:55:37 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 11:55:37 2012 -0500

    Fix SunPro version detection for two-digit minor version
    
    Through SunPro C/C++ versions 5.9 the __SUNPRO_C and __SUNPRO_CC macros
    had format
    
      0xVRP    V = Version
               R = Revision
               P = Patch
    
    More recent SunPro C/C++ versions may have two-digit revision (minor)
    numbers:
    
      0xVRRP   V  = Version
               RR = Revision
               P  = Patch

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 692c1fd..85e2671 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -33,9 +33,15 @@
 
 #elif defined(__SUNPRO_C)
 # define COMPILER_ID "SunPro"
-# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8)
-# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF)
-# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C    & 0xF)
+# if __SUNPRO_C >= 0x5100
+#  define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>12)
+#  define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xFF)
+#  define COMPILER_VERSION_PATCH HEX(__SUNPRO_C    & 0xF)
+# else
+#  define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8)
+#  define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF)
+#  define COMPILER_VERSION_PATCH HEX(__SUNPRO_C    & 0xF)
+# endif
 
 #elif defined(__HP_cc)
 # define COMPILER_ID "HP"
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index d983dc2..5f0cb6b 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -35,9 +35,15 @@
 
 #elif defined(__SUNPRO_CC)
 # define COMPILER_ID "SunPro"
-# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>8)
-# define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xF)
-# define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC    & 0xF)
+# if __SUNPRO_CC >= 0x5100
+#  define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>12)
+#  define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xFF)
+#  define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC    & 0xF)
+# else
+#  define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>8)
+#  define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xF)
+#  define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC    & 0xF)
+# endif
 
 #elif defined(__HP_aCC)
 # define COMPILER_ID "HP"

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

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


hooks/post-receive
-- 
CMake