diff options
| author | Brad King <brad.king@kitware.com> | 2011-09-02 12:37:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-09-02 12:56:01 (GMT) |
| commit | 38aab379629a797e959f93b40ba18e63f14d1f64 (patch) | |
| tree | 9d33ac91a34620d9953c50e7947505de071f5186 /Modules/CMakeDetermineCXXCompiler.cmake | |
| parent | 83ce7c4d3cbc8b4277e815f861456ea6f7ec18e3 (diff) | |
| download | CMake-38aab379629a797e959f93b40ba18e63f14d1f64.zip CMake-38aab379629a797e959f93b40ba18e63f14d1f64.tar.gz CMake-38aab379629a797e959f93b40ba18e63f14d1f64.tar.bz2 | |
Set CMAKE_<lang>_COMPILER_ID for VS generators
Currently the VS generators do not support Intel C/C++ .icproj files and
the MS tools do not include a Fortran compiler. Therefore we can always
set the C and CXX compiler IDs to "MSVC" and the Fortran ID to "Intel".
This fixes a regression in support for the Intel Fortran compiler under
the VS plugin introduced by commit cd43636c (Modernize Intel compiler
info on Windows, 2010-12-16). The commit moved the compiler information
into platform files that only load when the proper compiler id is set.
It worked for the NMake Makefiles generator but not for the VS IDE
generator because it did not set the compiler id.
Diffstat (limited to 'Modules/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index e77672d..8298369 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -117,10 +117,7 @@ ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION) IF(${CMAKE_GENERATOR} MATCHES "Visual Studio") SET(CMAKE_CXX_COMPILER_ID_RUN 1) SET(CMAKE_CXX_PLATFORM_ID "Windows") - - # TODO: Set the compiler id. It is probably MSVC but - # the user may be using an integrated Intel compiler. - # SET(CMAKE_CXX_COMPILER_ID "MSVC") + SET(CMAKE_CXX_COMPILER_ID "MSVC") ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio") IF(NOT CMAKE_CXX_COMPILER_ID_RUN) SET(CMAKE_CXX_COMPILER_ID_RUN 1) |