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 d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4 (commit)
via eddabf9fcf1783834dd7fdda335c54d08b44b0cc (commit)
from 60fcf1396200c66aa3a37eb2547b9c0669b17411 (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=d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4
commit d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4
Merge: 60fcf13 eddabf9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 14 09:40:07 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 14 09:40:07 2014 -0400
Merge topic 'intel-14-version' into next
eddabf9f CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eddabf9fcf1783834dd7fdda335c54d08b44b0cc
commit eddabf9fcf1783834dd7fdda335c54d08b44b0cc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 14 08:41:24 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 14 08:51:37 2014 -0400
CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
According to the Intel release notes:
http://software.intel.com/sites/default/files/l-compiler-release-update.pdf
the __INTEL_COMPILER_UPDATE predefined macro was introduced to hold the
third version component.
Reported-by: Dirk Ribbrock <dirk.ribbr...@mathematik.uni-dortmund.de>
Co-Author: Rolf Eike Beer <k...@opensource.sf-tec.de>
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 52f9590..561ccf2 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -14,7 +14,11 @@
/* __INTEL_COMPILER = VRP */
# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
-# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# endif
# if defined(__INTEL_COMPILER_BUILD_DATE)
/* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */
# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
diff --git a/Modules/CMakeCXXCompilerId.cpp.in
b/Modules/CMakeCXXCompilerId.cpp.in
index 25ceb3f..6c602d4 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -19,7 +19,11 @@
/* __INTEL_COMPILER = VRP */
# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
-# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# endif
# if defined(__INTEL_COMPILER_BUILD_DATE)
/* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */
# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompilerId.c.in | 6 +++++-
Modules/CMakeCXXCompilerId.cpp.in | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
