mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available

Browse Source 
VS now distributes these additional runtime libraries.  Install them if
available.

Fixes: #20228
This commit is contained in:
Brad King
2020-01-20 13:16:57 -05:00
parent 5b43aa7755
commit 7ca923bcaf
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/InstallRequiredSystemLibraries.cmake
+20 -6
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"