diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 16:04:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-11 16:05:51 (GMT) |
| commit | ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc (patch) | |
| tree | 05a3768d93205b48b78d6439b7807e24831d4d28 | |
| parent | 2eecd1c3bce761510f7090629c807a93e3742b1e (diff) | |
| download | CMake-ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc.zip CMake-ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc.tar.gz CMake-ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc.tar.bz2 | |
IRSL: Install vcruntime140_1.dll if available
VS 2019 now distributes this additional runtime DLL with its `14.2x`
toolsets.
Fixes: #19829
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 0f8c560..0e1429d 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -288,6 +288,9 @@ if(MSVC) "${MSVC_CRT_DIR}/msvcp${v}.dll" ) if(NOT vs VERSION_LESS 14) + if(EXISTS "${MSVC_CRT_DIR}/vcruntime${v}_1.dll") + list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}_1.dll") + endif() list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}.dll" "${MSVC_CRT_DIR}/concrt${v}.dll" @@ -306,6 +309,9 @@ if(MSVC) "${MSVC_CRT_DIR}/msvcp${v}d.dll" ) if(NOT vs VERSION_LESS 14) + if(EXISTS "${MSVC_CRT_DIR}/vcruntime${v}_1d.dll") + list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}_1d.dll") + endif() list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}d.dll" "${MSVC_CRT_DIR}/concrt${v}d.dll" |