diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-15 14:58:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-15 14:59:02 (GMT) |
| commit | a0b6448c855053301cba575c226abecef173f2c3 (patch) | |
| tree | e9f9a7eddeee664a6fc527f70768b65ed8eb6ed3 /Modules/InstallRequiredSystemLibraries.cmake | |
| parent | 33ee7793300f6ef9f5206e5a0539c192affa3d23 (diff) | |
| download | CMake-a0b6448c855053301cba575c226abecef173f2c3.zip CMake-a0b6448c855053301cba575c226abecef173f2c3.tar.gz CMake-a0b6448c855053301cba575c226abecef173f2c3.tar.bz2 | |
IRSL: Update redist directory for VS 2019 update 1
VS 2019 Update 1 will fix its redist directories to be named `VC142`
instead of `VC141`. It will also use cl `19.21` instead of `19.20`
so we can use that to distinguish the versions.
Fixes: #19131
Diffstat (limited to 'Modules/InstallRequiredSystemLibraries.cmake')
| -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) |