Forráskód Böngészése

IRSL: Install vcruntime140_1.dll if available

VS 2019 now distributes this additional runtime DLL with its `14.2x`
toolsets.

Fixes: #19829
Brad King 6 éve
szülő
commit
ecbf6546d7
1 módosított fájl, 6 hozzáadás és 0 törlés
  1. 6 0
      Modules/InstallRequiredSystemLibraries.cmake

+ 6 - 0
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"