[Cmake-commits] CMake branch, next, updated. v2.8.7-2048-g231a2b7

Brad King brad.king at kitware.com
Tue Jan 10 13:09:08 EST 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  231a2b784fe71b6a42d574c7f867ff53230acd43 (commit)
       via  d7c6f410f98123af03322bd916e49b9e21d90310 (commit)
      from  ac3fdfacad1a258baa86e55d50f657ffe36e26aa (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=231a2b784fe71b6a42d574c7f867ff53230acd43
commit 231a2b784fe71b6a42d574c7f867ff53230acd43
Merge: ac3fdfa d7c6f41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:08:32 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:08:32 2012 -0500

    Merge topic 'compiler-version' into next
    
    d7c6f41 Detect HP compiler version with its id


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7c6f410f98123af03322bd916e49b9e21d90310
commit d7c6f410f98123af03322bd916e49b9e21d90310
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:07:04 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:07:04 2012 -0500

    Detect HP compiler version with its id
    
    Decode decimal digits from __HP_cc and __HP_aCC to compute version
    number components.  See documentation at:
    
      http://predef.sourceforge.net/precomp.html
      http://g4u0420c.houston.hp.com/en/14487/preprocess.htm

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 85e2671..c39eccb 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -45,6 +45,9 @@
 
 #elif defined(__HP_cc)
 # define COMPILER_ID "HP"
+# define COMPILER_VERSION_MAJOR DEC(__HP_cc/10000)
+# define COMPILER_VERSION_MINOR DEC(__HP_cc/100 % 100)
+# define COMPILER_VERSION_PATCH DEC(__HP_cc     % 100)
 
 #elif defined(__DECC)
 # define COMPILER_ID "Compaq"
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 5f0cb6b..bf4eaf9 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -47,6 +47,9 @@
 
 #elif defined(__HP_aCC)
 # define COMPILER_ID "HP"
+# define COMPILER_VERSION_MAJOR DEC(__HP_aCC/10000)
+# define COMPILER_VERSION_MINOR DEC(__HP_aCC/100 % 100)
+# define COMPILER_VERSION_PATCH DEC(__HP_aCC     % 100)
 
 #elif defined(__DECCXX)
 # define COMPILER_ID "Compaq"

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list