diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-20 11:37:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-20 11:37:38 (GMT) |
| commit | f040840f9b4c3c431b327b167fdbfb5df6c3ec8f (patch) | |
| tree | 6078b4064e92d1828d7aa6878941725f91e7aa76 /Modules | |
| parent | 2e685168181db59dc9004524ac6c44b4244e1127 (diff) | |
| parent | 1b7117a8248da32038c6f3503ffebe38089f8610 (diff) | |
| download | CMake-f040840f9b4c3c431b327b167fdbfb5df6c3ec8f.zip CMake-f040840f9b4c3c431b327b167fdbfb5df6c3ec8f.tar.gz CMake-f040840f9b4c3c431b327b167fdbfb5df6c3ec8f.tar.bz2 | |
Merge topic 'vs-intel-compiler'
1b7117a VS 6: Do not try Intel Fortran .vfproj file with msdev
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index e591f2c..0d7aa61 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -109,7 +109,11 @@ Id flags: ${testflags} ") # Compile the compiler identification source. - if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)") + if(CMAKE_GENERATOR STREQUAL "Visual Studio 6" AND + lang STREQUAL "Fortran") + set(CMAKE_${lang}_COMPILER_ID_RESULT 1) + set(CMAKE_${lang}_COMPILER_ID_OUTPUT "No Intel Fortran in VS 6") + elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)") set(vs_version ${CMAKE_MATCH_1}) set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_lang "${lang}") |