Commit cce342a5 authored by Brad King's avatar Brad King

Merge branch 'vs2019-redist' into release-3.14

Merge-request: !3233
parents a6bf6814 a0b6448c
......@@ -213,10 +213,13 @@ if(MSVC)
elseif(MSVC_VERSION_VERSION GREATER_EQUAL 143)
message(WARNING "MSVC toolset v${MSVC_VERSION_VERSION} not yet supported.")
elseif(MSVC_TOOLSET_VERSION EQUAL 142)
# FIXME: VS 2019 RC 4 uses VC141 but an update will fix it to be VC142.
set(MSVC_REDIST_NAME VC141)
set(MSVC_REDIST_NAME VC142)
set(_MSVC_DLL_VERSION 140)
set(_MSVC_IDE_VERSION 16)
if(MSVC_VERSION EQUAL 1920)
# VS2019 named this differently prior to update 1.
set(MSVC_REDIST_NAME VC141)
endif()
elseif(MSVC_TOOLSET_VERSION EQUAL 141)
set(MSVC_REDIST_NAME VC141)
set(_MSVC_DLL_VERSION 140)
......
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