diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 16:08:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-11 16:08:27 (GMT) |
| commit | 83dbef11352c0075bf0c6c504f0094457b352051 (patch) | |
| tree | d21ea30745791aa7880b1f938f728b28e2cea989 | |
| parent | 881bca249defc148bc98d3caa9799f34536dd256 (diff) | |
| parent | ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc (diff) | |
| download | CMake-83dbef11352c0075bf0c6c504f0094457b352051.zip CMake-83dbef11352c0075bf0c6c504f0094457b352051.tar.gz CMake-83dbef11352c0075bf0c6c504f0094457b352051.tar.bz2 | |
Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15
Merge-request: !3909
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index e3eeea4..0e1429d 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -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" |