diff options
author | Brad King <brad.king@kitware.com> | 2013-10-19 10:30:57 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-10-19 10:37:22 (GMT) |
commit | 1b7117a8248da32038c6f3503ffebe38089f8610 (patch) | |
tree | 0d93851ac2ca4dfd667b48545286796513aa5000 /Modules | |
parent | d14898b6dc4f5f20c96b02fccb313ba0c119033f (diff) | |
download | CMake-1b7117a8248da32038c6f3503ffebe38089f8610.zip CMake-1b7117a8248da32038c6f3503ffebe38089f8610.tar.gz CMake-1b7117a8248da32038c6f3503ffebe38089f8610.tar.bz2 |
VS 6: Do not try Intel Fortran .vfproj file with msdev
Teach CMakeDetermineCompilerId to skip trying to build a .vfproj
file for Intel Fortran under Visual Studio 6. The msdev command-line
build produces a popup error dialog that hangs the configuration.
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}") |