diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-16 19:27:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-18 13:55:59 (GMT) |
| commit | d14898b6dc4f5f20c96b02fccb313ba0c119033f (patch) | |
| tree | 9a8d8ff54c0285ac3319f1f1afac0484a4942e59 | |
| parent | a85e17e660c47820ccccd8378349497804d94483 (diff) | |
| download | CMake-d14898b6dc4f5f20c96b02fccb313ba0c119033f.zip CMake-d14898b6dc4f5f20c96b02fccb313ba0c119033f.tar.gz CMake-d14898b6dc4f5f20c96b02fccb313ba0c119033f.tar.bz2 | |
Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran
The Intel Fortran 10 64-bit compiler incorrectly defines _MSC_VER to its
own version (1020) instead of the underlying MSVC tools version. Since
we expect the compiler to be used only with VS >= 7 tools, assume MSVC
version 13.0 if _MSC_VER is not greater than 1300.
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index b8f8f7d..5349505 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -18,10 +18,8 @@ PRINT *, 'INFO:simulate_version[014.00]' # elif _MSC_VER >= 1310 PRINT *, 'INFO:simulate_version[013.01]' -# elif _MSC_VER >= 1300 +# else PRINT *, 'INFO:simulate_version[013.00]' -# elif _MSC_VER >= 1200 - PRINT *, 'INFO:simulate_version[012.00]' # endif # endif #elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95) |