diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:49:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-17 13:49:50 (GMT) |
| commit | 4807c639481baf86ee229902236dd2cbe998184c (patch) | |
| tree | 504c6b014bd8806cd3f4296c15f81e0f06ef5da2 | |
| parent | 6313be44aa465ea883e3578b3a0424ae0c217d5c (diff) | |
| parent | eddabf9fcf1783834dd7fdda335c54d08b44b0cc (diff) | |
| download | CMake-4807c639481baf86ee229902236dd2cbe998184c.zip CMake-4807c639481baf86ee229902236dd2cbe998184c.tar.gz CMake-4807c639481baf86ee229902236dd2cbe998184c.tar.bz2 | |
Merge topic 'intel-14-version'
eddabf9f CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
| -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 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) |