From d14898b6dc4f5f20c96b02fccb313ba0c119033f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Oct 2013 15:27:14 -0400 Subject: [PATCH] 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. --- Modules/CMakeFortranCompilerId.F.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index b8f8f7d68..53495051d 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)