diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-21 14:15:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-21 14:15:17 (GMT) |
| commit | bcb0816cf96529392dab21d5d97f62ee7ce47493 (patch) | |
| tree | 2ca288d74995174c13efdfc624965d475977883c | |
| parent | b168d8e855a58a4b805202422f16e4c4bb5c7fb1 (diff) | |
| parent | 7ca923bcaf0b548445fca8c0c18784aca3415bc2 (diff) | |
| download | CMake-bcb0816cf96529392dab21d5d97f62ee7ce47493.zip CMake-bcb0816cf96529392dab21d5d97f62ee7ce47493.tar.gz CMake-bcb0816cf96529392dab21d5d97f62ee7ce47493.tar.bz2 | |
Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com>
Merge-request: !4247
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 0e1429d..04687b9 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -288,9 +288,16 @@ 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() + foreach(crt + "${MSVC_CRT_DIR}/msvcp${v}_1.dll" + "${MSVC_CRT_DIR}/msvcp${v}_2.dll" + "${MSVC_CRT_DIR}/msvcp${v}_codecvt_ids.dll" + "${MSVC_CRT_DIR}/vcruntime${v}_1.dll" + ) + if(EXISTS "${crt}") + list(APPEND __install__libs "${crt}") + endif() + endforeach() list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}.dll" "${MSVC_CRT_DIR}/concrt${v}.dll" @@ -309,9 +316,16 @@ 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() + foreach(crt + "${MSVC_CRT_DIR}/msvcp${v}_1d.dll" + "${MSVC_CRT_DIR}/msvcp${v}_2d.dll" + "${MSVC_CRT_DIR}/msvcp${v}d_codecvt_ids.dll" + "${MSVC_CRT_DIR}/vcruntime${v}_1d.dll" + ) + if(EXISTS "${crt}") + list(APPEND __install__libs "${crt}") + endif() + endforeach() list(APPEND __install__libs "${MSVC_CRT_DIR}/vcruntime${v}d.dll" "${MSVC_CRT_DIR}/concrt${v}d.dll" |