diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-18 14:01:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-18 14:01:58 (GMT) |
| commit | f6cc3b074485f8ccf4b6566ac5f117feb40ce998 (patch) | |
| tree | ca7cd5cdbd74c206caff29526d07fceeb462c796 /Modules/CMakeFindBinUtils.cmake | |
| parent | eff13ebf336a87e1e572ab89dea7a669674c20bc (diff) | |
| parent | d14898b6dc4f5f20c96b02fccb313ba0c119033f (diff) | |
| download | CMake-f6cc3b074485f8ccf4b6566ac5f117feb40ce998.zip CMake-f6cc3b074485f8ccf4b6566ac5f117feb40ce998.tar.gz CMake-f6cc3b074485f8ccf4b6566ac5f117feb40ce998.tar.bz2 | |
Merge topic 'vs-intel-compiler'
d14898b Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran
a85e17e Intel: When simulating MSVC, re-use Windows-MSVC (#14476)
af40e8c VS: Detect Intel Fortran compiler id and version
b8522a8 VS: Expose Intel Fortran .vfproj format version to CMake language
2d36c9a CMakeDetermineCompilerId: Fix Intel Fortran compiler id detection
a6fd17c VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)
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 b4e2ae5..315d57e 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") |