diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-15 15:02:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-15 15:02:17 (GMT) |
| commit | cce342a5b966c57d933951053757090fc860a067 (patch) | |
| tree | f2ac709b5225b9f08a03b1f981ae227fc9266bff /Modules | |
| parent | a6bf68141faca9af22624c8d0e1603653a73fce4 (diff) | |
| parent | a0b6448c855053301cba575c226abecef173f2c3 (diff) | |
| download | CMake-cce342a5b966c57d933951053757090fc860a067.zip CMake-cce342a5b966c57d933951053757090fc860a067.tar.gz CMake-cce342a5b966c57d933951053757090fc860a067.tar.bz2 | |
Merge branch 'vs2019-redist' into release-3.14
Merge-request: !3233
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 2f34a7a..0a98895 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -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) |