diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-11 17:54:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-18 13:55:59 (GMT) |
| commit | a85e17e660c47820ccccd8378349497804d94483 (patch) | |
| tree | 28d211b2814865d81830b112fffc398ace58919b /Modules/CMakeCXXCompilerId.cpp.in | |
| parent | af40e8c31256095eb8436b798fa1fbc0c71b0319 (diff) | |
| download | CMake-a85e17e660c47820ccccd8378349497804d94483.zip CMake-a85e17e660c47820ccccd8378349497804d94483.tar.gz CMake-a85e17e660c47820ccccd8378349497804d94483.tar.bz2 | |
Intel: When simulating MSVC, re-use Windows-MSVC (#14476)
Teach CMake(C|CXX|Fortran)CompilerId* to report the MSVC version
simulated by the Intel compiler, if any. Refactor the Windows-Intel
platform information helper module to load Windows-MSVC instead of
duplicating the information. Teach Windows-MSVC to understand when
it is loaded as the simulated Fortran compiler (its preprocessor is
simulated).
Diffstat (limited to 'Modules/CMakeCXXCompilerId.cpp.in')
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 3a60922..f32fee0 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -24,6 +24,12 @@ /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ # define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) # endif +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif #elif defined(__PATHCC__) # define COMPILER_ID "PathScale" |