diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-10 13:17:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-10 13:17:43 (GMT) |
| commit | 487b6ccdcd7612768d920050dd0b0b67cd32775f (patch) | |
| tree | 92679bb17a59ebfa7a9533eb4da8580b39ceffa1 /Modules/Compiler/Intel-DetermineCompiler.cmake | |
| parent | e0471ae2f93ef46461ff462bbc9e3be9b64c55ed (diff) | |
| parent | ddec418a8f27e62ae9f37cd03d28a42eeaa1527f (diff) | |
| download | CMake-487b6ccdcd7612768d920050dd0b0b67cd32775f.zip CMake-487b6ccdcd7612768d920050dd0b0b67cd32775f.tar.gz CMake-487b6ccdcd7612768d920050dd0b0b67cd32775f.tar.bz2 | |
Merge topic 'WriteCompilerDetectionHeader-compiler-versions'
ddec418a Features: Add compiler version support to WriteCompilerDetectionHeader.
b7029576 Project: Add configurable name for version computation macros.
78acaafe Project: Separate simulated compiler id from version detection.
567af1a5 WCDH: Issue a better message for version compatibility.
Diffstat (limited to 'Modules/Compiler/Intel-DetermineCompiler.cmake')
| -rw-r--r-- | Modules/Compiler/Intel-DetermineCompiler.cmake | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Modules/Compiler/Intel-DetermineCompiler.cmake b/Modules/Compiler/Intel-DetermineCompiler.cmake index 6fada1c..d7e4532 100644 --- a/Modules/Compiler/Intel-DetermineCompiler.cmake +++ b/Modules/Compiler/Intel-DetermineCompiler.cmake @@ -3,20 +3,24 @@ set(_compiler_id_pp_test "defined(__INTEL_COMPILER) || defined(__ICC)") set(_compiler_id_version_compute " /* __INTEL_COMPILER = VRP */ -# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) -# define @PREFIX@COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) +# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__INTEL_COMPILER/100) +# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__INTEL_COMPILER/10 % 10) # if defined(__INTEL_COMPILER_UPDATE) -# define @PREFIX@COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__INTEL_COMPILER_UPDATE) # else -# define @PREFIX@COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__INTEL_COMPILER % 10) # endif # if defined(__INTEL_COMPILER_BUILD_DATE) /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ -# define @PREFIX@COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) +# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__INTEL_COMPILER_BUILD_DATE) # endif # if defined(_MSC_VER) -# define @PREFIX@SIMULATE_ID \"MSVC\" /* _MSC_VER = VVRR */ -# define @PREFIX@SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) -# define @PREFIX@SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100) +# define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100) +# endif") + +set(_compiler_id_simulate " +# if defined(_MSC_VER) +# define @PREFIX@SIMULATE_ID \"MSVC\" # endif") |