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

Merge topic 'InstallRequiredSystemLibraries-redist'

Browse Source 
ecbf6546d7 IRSL: Install vcruntime140_1.dll if available
2eecd1c3bc IRSL: Prefer MSVC runtime libraries from newest toolset first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3909
This commit is contained in:
Brad King
2019-10-12 14:22:20 +00:00
committed by Kitware Robot
parent b727e74fb0 ecbf6546d7
commit 7676966f99
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -258,6 +258,7 @@ if(MSVC)
cmake_host_system_information(RESULT _vs_dir QUERY VS_${_vs_ver}_DIR) # undocumented query
if(IS_DIRECTORY "${_vs_dir}")
file(GLOB _vs_glob_redist_paths "${_vs_dir}/VC/Redist/MSVC/*")
list(REVERSE _vs_glob_redist_paths)
list(APPEND _vs_redist_paths ${_vs_glob_redist_paths})
endif()
unset(_vs_glob_redist_paths)
@@ -287,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"
@@ -305,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"