diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-11 13:54:50 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-18 09:55:59 -0400 |
| commit | a85e17e660c47820ccccd8378349497804d94483 (patch) | |
| tree | 28d211b2814865d81830b112fffc398ace58919b /Modules/CMakeFindBinUtils.cmake | |
| parent | af40e8c31256095eb8436b798fa1fbc0c71b0319 (diff) | |
| download | cmake-a85e17e660c47820ccccd8378349497804d94483.tar.gz | |
Intel: When simulating MSVC, re-use Windows-MSVC (#14476)
Teach CMake(C|CXX|Fortran)CompilerId* to report the MSVC version
simulated by the Intel compiler, if any. Refactor the Windows-Intel
platform information helper module to load Windows-MSVC instead of
duplicating the information. Teach Windows-MSVC to understand when
it is loaded as the simulated Fortran compiler (its preprocessor is
simulated).
Diffstat (limited to 'Modules/CMakeFindBinUtils.cmake')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index b4e2ae5448..315d57ec32 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -32,6 +32,7 @@ # if it's the MS C/CXX compiler, search for link if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC" + OR "${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "MSVC" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio") |