kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-intel-compiler' 

1b7117a VS 6: Do not try Intel Fortran .vfproj file with msdev
This commit is contained in:
Brad King 2013-10-20 07:37:38 -04:00 committed by CMake Topic Stage
parent 2e68516818 1b7117a824
commit f040840f9b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CMakeDetermineCompilerId.cmake
View File

@ -109,7 +109,11 @@ Id flags: ${testflags}
") ")
# Compile the compiler identification source. # 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(vs_version ${CMAKE_MATCH_1})
set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_platform ${CMAKE_VS_PLATFORM_NAME})
set(id_lang "${lang}") set(id_lang "${lang}")