mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 15:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16

Browse Source 
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
This commit is contained in:
Brad King
2020-01-21 14:15:09 +00:00
committed by Kitware Robot
parent b168d8e855 7ca923bcaf
commit bcb0816cf9
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -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"