diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-12 14:22:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-12 14:23:34 (GMT) |
| commit | 7676966f997a22549b1a45ebedca566bb278acdb (patch) | |
| tree | d38e1b07876ca381280554a8b00778766b1a74ef /Modules | |
| parent | b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1 (diff) | |
| parent | ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc (diff) | |
| download | CMake-7676966f997a22549b1a45ebedca566bb278acdb.zip CMake-7676966f997a22549b1a45ebedca566bb278acdb.tar.gz CMake-7676966f997a22549b1a45ebedca566bb278acdb.tar.bz2 | |
Merge topic 'InstallRequiredSystemLibraries-redist'
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
Diffstat (limited to 'Modules')
| -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" |