Commit ecbf6546 authored by Brad King's avatar Brad King

IRSL: Install vcruntime140_1.dll if available

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

Fixes: #19829
parent 2eecd1c3
...@@ -288,6 +288,9 @@ if(MSVC) ...@@ -288,6 +288,9 @@ if(MSVC)
"${MSVC_CRT_DIR}/msvcp${v}.dll" "${MSVC_CRT_DIR}/msvcp${v}.dll"
) )
if(NOT vs VERSION_LESS 14) 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 list(APPEND __install__libs
"${MSVC_CRT_DIR}/vcruntime${v}.dll" "${MSVC_CRT_DIR}/vcruntime${v}.dll"
"${MSVC_CRT_DIR}/concrt${v}.dll" "${MSVC_CRT_DIR}/concrt${v}.dll"
...@@ -306,6 +309,9 @@ if(MSVC) ...@@ -306,6 +309,9 @@ if(MSVC)
"${MSVC_CRT_DIR}/msvcp${v}d.dll" "${MSVC_CRT_DIR}/msvcp${v}d.dll"
) )
if(NOT vs VERSION_LESS 14) 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 list(APPEND __install__libs
"${MSVC_CRT_DIR}/vcruntime${v}d.dll" "${MSVC_CRT_DIR}/vcruntime${v}d.dll"
"${MSVC_CRT_DIR}/concrt${v}d.dll" "${MSVC_CRT_DIR}/concrt${v}d.dll"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment