diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-14 10:00:16 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-14 10:00:16 -0400 |
| commit | aa195cdcbe21bf55504ece0b94c4d3e371ecb458 (patch) | |
| tree | 4693f30c3828413a2f5640c443bdf790cdca2557 | |
| parent | 967d09fec35262460d711504b76b4b95fe3245de (diff) | |
| parent | eddabf9fcf1783834dd7fdda335c54d08b44b0cc (diff) | |
| download | cmake-aa195cdcbe21bf55504ece0b94c4d3e371ecb458.tar.gz | |
Merge branch 'intel-14-version' into release
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 6 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 52f9590f68..561ccf21b8 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 25ceb3fb14..6c602d46e8 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) |