mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'msvc-version'

Browse Source 
3bc21a70 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1488
This commit is contained in:
Brad King
2017-11-16 15:49:57 +00:00
committed by Kitware Robot
parent e24d2b58b4 3bc21a70b5
commit 8f9301ba25
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Platform/Windows-MSVC.cmake
+5 -1
View File
@@ -48,7 +48,11 @@ else()
endif()
if(NOT MSVC_VERSION)
if(CMAKE_C_SIMULATE_VERSION)
if("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC")
set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
elseif(CMAKE_C_SIMULATE_VERSION)
set(_compiler_version ${CMAKE_C_SIMULATE_VERSION})
elseif(CMAKE_CXX_SIMULATE_VERSION)
set(_compiler_version ${CMAKE_CXX_SIMULATE_VERSION})