Commit 80420d3c authored by Brad King's avatar Brad King
Browse files

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

Merge-request: !1240
parents 55c4b681 1dd2c08b
......@@ -175,7 +175,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)
......@@ -199,10 +204,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)
......@@ -397,10 +398,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)
......@@ -415,9 +417,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)
......@@ -488,10 +487,11 @@ if(MSVC)
# MSVC 8 was the first version with OpenMP
# Furthermore, there is no debug version of this
if(CMAKE_INSTALL_OPENMP_LIBRARIES)
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)
......@@ -512,9 +512,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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment