mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 00:11:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-irsl-vs15-future' into irsl-vs15-future

Browse Source
This commit is contained in:
Brad King
2017-09-06 11:37:30 -04:00
parent c6f9c6f67a 1dd2c08b19
commit 6dd0a593d9
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -205,7 +205,12 @@ if(MSVC)
endif()
endif()
if(MSVC_VERSION EQUAL 1911)
set(MSVC_REDIST_NAME "")
set(_MSVCRT_DLL_VERSION "")
set(_MSVCRT_IDE_VERSION "")
if(MSVC_VERSION GREATER_EQUAL 2000)
message(WARNING "MSVC ${MSVC_VERSION} not yet supported.")
elseif(MSVC_VERSION GREATER_EQUAL 1911)
set(MSVC_REDIST_NAME VC141)
set(_MSVCRT_DLL_VERSION 140)
set(_MSVCRT_IDE_VERSION 15)
@@ -229,10 +234,6 @@ if(MSVC)
set(MSVC_REDIST_NAME VC100)
set(_MSVCRT_DLL_VERSION 100)
set(_MSVCRT_IDE_VERSION 10)
else()
set(MSVC_REDIST_NAME "")
set(_MSVCRT_DLL_VERSION "")
set(_MSVCRT_IDE_VERSION "")
endif()
if(_MSVCRT_DLL_VERSION)
@@ -427,10 +428,11 @@ if(MSVC)
)
endif()
if(MSVC_VERSION EQUAL 1911)
set(_MFC_DLL_VERSION 140)
set(_MFC_IDE_VERSION 15)
elseif(MSVC_VERSION EQUAL 1910)
set(_MFC_DLL_VERSION "")
set(_MFC_IDE_VERSION "")
if(MSVC_VERSION GREATER_EQUAL 2000)
# Version not yet supported.
elseif(MSVC_VERSION GREATER_EQUAL 1910)
set(_MFC_DLL_VERSION 140)
set(_MFC_IDE_VERSION 15)
elseif(MSVC_VERSION EQUAL 1900)
@@ -445,9 +447,6 @@ if(MSVC)
elseif(MSVC_VERSION EQUAL 1600)
set(_MFC_DLL_VERSION 100)
set(_MFC_IDE_VERSION 10)
else()
set(_MFC_DLL_VERSION "")
set(_MFC_IDE_VERSION "")
endif()
if(_MFC_DLL_VERSION)
@@ -518,10 +517,11 @@ if(MSVC)
# MSVC 8 was the first version with OpenMP
# Furthermore, there is no debug version of this
if(CMAKE_INSTALL_OPENMP_LIBRARIES AND _IRSL_HAVE_MSVC)
if(MSVC_VERSION EQUAL 1911)
set(_MSOMP_DLL_VERSION 140)
set(_MSOMP_IDE_VERSION 15)
elseif(MSVC_VERSION EQUAL 1910)
set(_MSOMP_DLL_VERSION "")
set(_MSOMP_IDE_VERSION "")
if(MSVC_VERSION GREATER_EQUAL 2000)
# Version not yet supported.
elseif(MSVC_VERSION GREATER_EQUAL 1910)
set(_MSOMP_DLL_VERSION 140)
set(_MSOMP_IDE_VERSION 15)
elseif(MSVC_VERSION EQUAL 1900)
@@ -542,9 +542,6 @@ if(MSVC)
elseif(MSVC_VERSION EQUAL 1400)
set(_MSOMP_DLL_VERSION 80)
set(_MSOMP_IDE_VERSION 8)
else()
set(_MSOMP_DLL_VERSION "")
set(_MSOMP_IDE_VERSION "")
endif()
if(_MSOMP_DLL_VERSION)