[Cmake-commits] CMake branch, next, updated. v2.8.9-237-g124da7a
Brad King
brad.king at kitware.com
Wed Aug 22 15:07:51 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 124da7a2c6519e86096d1d18f1bc8eac49216b7d (commit)
via e9bc502fb82d7e48e12d9a2bd380c137f6cbc03d (commit)
via cca386b0a058c050a03c10bf1b9f1344aef7de3f (commit)
via 622d9a789dc72b159f7d571e3a700db5d090c1ef (commit)
via 4ad7fa64889d4a05bce3540ae1a6dbd87f654d9d (commit)
via 952651c6428755f50a80d3b64a4e09d3bd1afc3b (commit)
via 74c57d99b4328c18b533d76e7f009e7daddc04df (commit)
via 707aefd853d1fec2960058e2e921e5d24c736526 (commit)
from db76019bf92ed8b6b6e5bccfb0cf7eb704ad12b1 (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=124da7a2c6519e86096d1d18f1bc8eac49216b7d
commit 124da7a2c6519e86096d1d18f1bc8eac49216b7d
Merge: db76019 e9bc502
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 15:07:45 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 22 15:07:45 2012 -0400
Merge topic 'more-compiler-versions' into next
e9bc502 Detect Analog VisualDSP++ compiler version with its id
cca386b Detect Cray compiler version with its id
622d9a7 Detect SDCC compiler version with its id
4ad7fa6 Detect Comeau compiler version with its id
952651c Detect TI compiler version with its id
74c57d9 Detect PathScale compiler version with its id
707aefd Detect Compaq compiler version with its id
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9bc502fb82d7e48e12d9a2bd380c137f6cbc03d
commit e9bc502fb82d7e48e12d9a2bd380c137f6cbc03d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 11:48:07 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 11:48:07 2012 -0400
Detect Analog VisualDSP++ compiler version with its id
Decode hex digits from __VISUALDSPVERSION__ to compute the version
number components. Note that the constant encodes decimal digits as hex
digits (never larger than 9). We represent them as decimal after
extraction. See documentation at:
http://download.analog.com/dsp/tools/VisualDSP_45_Update_6_Release_Note_v4.pdf
http://www.analog.com/static/imported-files/software_manuals/50_asm_man.rev3.1.pdf
Note that __VISUALDSPVERSION__ was introduced in version 4.5.6.
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index f57a52a..c5bde9a 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -147,9 +147,16 @@
# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD)
# endif
+/* Analog VisualDSP++ >= 4.5.6 */
+#elif defined(__VISUALDSPVERSION__)
+# define COMPILER_ID "ADSP"
+ /* __VISUALDSPVERSION__ = 0xVVRRPP00 */
+# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24)
+# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF)
+# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF)
+
+/* Analog VisualDSP++ < 4.5.6 */
#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
- SHARC (21000) DSPs */
# define COMPILER_ID "ADSP"
/* IAR Systems compiler for embedded systems.
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index a784ba8..2c8dd4b 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -149,9 +149,16 @@
# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD)
# endif
+/* Analog VisualDSP++ >= 4.5.6 */
+#elif defined(__VISUALDSPVERSION__)
+# define COMPILER_ID "ADSP"
+ /* __VISUALDSPVERSION__ = 0xVVRRPP00 */
+# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24)
+# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF)
+# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF)
+
+/* Analog VisualDSP++ < 4.5.6 */
#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
- SHARC (21000) DSPs */
# define COMPILER_ID "ADSP"
#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cca386b0a058c050a03c10bf1b9f1344aef7de3f
commit cca386b0a058c050a03c10bf1b9f1344aef7de3f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 11:31:33 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 11:31:33 2012 -0400
Detect Cray compiler version with its id
Decode decimal digits from
_RELEASE
_RELEASE_MINOR
to compute version number components. See documentation at:
http://docs.cray.com/books/S-2179-52/html-S-2179-52/zfixed5fvzxnxo.html
http://sourceforge.net/p/predef/wiki/Compilers/#cray-c
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index d6e192d..f57a52a 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -105,6 +105,8 @@
#elif defined(_CRAYC)
# define COMPILER_ID "Cray"
+# define COMPILER_VERSION_MAJOR DEC(_RELEASE)
+# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR)
#elif defined(__TI_COMPILER_VERSION__)
# define COMPILER_ID "TI_DSP"
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index a11996d..a784ba8 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -110,6 +110,8 @@
#elif defined(_CRAYC)
# define COMPILER_ID "Cray"
+# define COMPILER_VERSION_MAJOR DEC(_RELEASE)
+# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR)
#elif defined(__TI_COMPILER_VERSION__)
# define COMPILER_ID "TI_DSP"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=622d9a789dc72b159f7d571e3a700db5d090c1ef
commit 622d9a789dc72b159f7d571e3a700db5d090c1ef
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 10:27:09 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 10:27:09 2012 -0400
Detect SDCC compiler version with its id
Decode decimal digits from SDCC to compute version number components.
See documentation at:
http://sdcc.sourceforge.net/doc/sdccman.pdf
http://sourceforge.net/p/predef/wiki/Compilers/#small-device-c-compilerhttpenwikipediaorgwikismall_device_c_compiler
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 331be06..d6e192d 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -160,6 +160,10 @@
http://sdcc.sourceforge.net */
#elif defined(SDCC)
# define COMPILER_ID "SDCC"
+ /* SDCC = VRP */
+# define COMPILER_VERSION_MAJOR DEC(SDCC/100)
+# define COMPILER_VERSION_MINOR DEC(SDCC/10 % 10)
+# define COMPILER_VERSION_PATCH DEC(SDCC % 10)
#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
# define COMPILER_ID "MIPSpro"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ad7fa64889d4a05bce3540ae1a6dbd87f654d9d
commit 4ad7fa64889d4a05bce3540ae1a6dbd87f654d9d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 10:16:12 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 10:17:01 2012 -0400
Detect Comeau compiler version with its id
Decode decimal digits from __COMO_VERSION__ to compute the version
number components. See documentation at:
http://www.comeaucomputing.com/4.0/docs/userman/predefs.html
http://sourceforge.net/p/predef/wiki/Compilers/#comeau-chttpenwikipediaorgwikicomeau_cc2b2b
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index acffbf4..a11996d 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -10,6 +10,9 @@
#if defined(__COMO__)
# define COMPILER_ID "Comeau"
+ /* __COMO_VERSION__ = VRR */
+# define COMPILER_VERSION_MAJOR DEC(__COMO_VERSION__ / 100)
+# define COMPILER_VERSION_MINOR DEC(__COMO_VERSION__ % 100)
#elif defined(__INTEL_COMPILER) || defined(__ICC)
# define COMPILER_ID "Intel"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=952651c6428755f50a80d3b64a4e09d3bd1afc3b
commit 952651c6428755f50a80d3b64a4e09d3bd1afc3b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 10:15:58 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 10:17:01 2012 -0400
Detect TI compiler version with its id
Decode decimal digits from __TI_COMPILER_VERSION__ to compute version
number components. See documentation at:
http://processors.wiki.ti.com/index.php/Refer_to_Compiler_Version_in_Your_Source
http://www.ti.com/general/docs/lit/getliterature.tsp?literatureNumber=spru187o
http://sourceforge.net/p/predef/wiki/Compilers/#texas-instruments-cc-compiler
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 8b5b899..331be06 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -108,6 +108,10 @@
#elif defined(__TI_COMPILER_VERSION__)
# define COMPILER_ID "TI_DSP"
+ /* __TI_COMPILER_VERSION__ = VVVRRRPPP */
+# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000)
+# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000)
+# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000)
#elif defined(__TINYC__)
# define COMPILER_ID "TinyCC"
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 80e6d19..acffbf4 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -110,6 +110,10 @@
#elif defined(__TI_COMPILER_VERSION__)
# define COMPILER_ID "TI_DSP"
+ /* __TI_COMPILER_VERSION__ = VVVRRRPPP */
+# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000)
+# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000)
+# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000)
#elif defined(__SCO_VERSION__)
# define COMPILER_ID "SCO"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74c57d99b4328c18b533d76e7f009e7daddc04df
commit 74c57d99b4328c18b533d76e7f009e7daddc04df
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 10:15:40 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 10:17:01 2012 -0400
Detect PathScale compiler version with its id
Decode decimal digits from
__PATHCC__
__PATHCC_MINOR__
__PATHCC_PATCHLEVEL__
to compute version number components. See documentation at:
http://www.pathscale.com/docs/UserGuide.pdf
http://sourceforge.net/p/predef/wiki/Compilers/#ekopathhttpenwikipediaorgwikipathscale
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 7771dbf..8b5b899 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -95,8 +95,13 @@
# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
# endif
-#elif defined(__PATHSCALE__)
+#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"
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 47cd45c..80e6d19 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -97,8 +97,13 @@
# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
# endif
-#elif defined(__PATHSCALE__)
+#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"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=707aefd853d1fec2960058e2e921e5d24c736526
commit 707aefd853d1fec2960058e2e921e5d24c736526
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 10:15:00 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 10:17:01 2012 -0400
Detect Compaq compiler version with its id
Decode decimal digits from __DECC_VER and __DECCXX_VER to compute
version number components. See documentation at:
http://www.openvms.compaq.com/commercial/c/docs/5492p024.html#decc_ver_sec
http://www.tru64unix.compaq.com/cplus/ugu_impl.html#predef_vernum
http://sourceforge.net/p/predef/wiki/Compilers/#compaq-cchttpwwwopenvmscompaqcomopenvmsbrochuresdeccplus
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 06aa9bf..7771dbf 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -67,6 +67,10 @@
#elif defined(__DECC)
# define COMPILER_ID "Compaq"
+ /* __DECC_VER = VVRRTPPPP */
+# define COMPILER_VERSION_MAJOR DEC(__DECC_VER/10000000)
+# define COMPILER_VERSION_MINOR DEC(__DECC_VER/100000 % 100)
+# define COMPILER_VERSION_PATCH DEC(__DECC_VER % 10000)
#elif defined(__IBMC__)
# if defined(__COMPILER_VER__)
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 95fc852..47cd45c 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -69,6 +69,10 @@
#elif defined(__DECCXX)
# define COMPILER_ID "Compaq"
+ /* __DECCXX_VER = VVRRTPPPP */
+# define COMPILER_VERSION_MAJOR DEC(__DECCXX_VER/10000000)
+# define COMPILER_VERSION_MINOR DEC(__DECCXX_VER/100000 % 100)
+# define COMPILER_VERSION_PATCH DEC(__DECCXX_VER % 10000)
#elif defined(__IBMCPP__)
# if defined(__COMPILER_VER__)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompilerId.c.in | 32 +++++++++++++++++++++++++++++---
Modules/CMakeCXXCompilerId.cpp.in | 31 ++++++++++++++++++++++++++++---
2 files changed, 57 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list