mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 20:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

IRSL: Fix discovery of VS 2019 v141 toolset redistributables

Browse Source 
Since VS 2019, the v141 toolset redistributables can be found in
either the VS 2019 or VS 2017 install directory. Update the logic
to search multiple versions of VS.

Fixes: #19488
This commit is contained in:
James Butler
2019-07-20 17:27:50 -04:00
committed by Brad King
parent 0484165da0
commit 13c3ec545b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -251,10 +251,18 @@ if(MSVC)
endif()
if(NOT vs VERSION_LESS 15)
set(_vs_redist_paths "")
cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR) # undocumented query
if(IS_DIRECTORY "${_vs_dir}")
file(GLOB _vs_redist_paths "${_vs_dir}/VC/Redist/MSVC/*")
endif()
# The toolset and its redistributables may come with any VS version 15 or newer.
set(_MSVC_IDE_VERSIONS 16 15)
foreach(_vs_ver ${_MSVC_IDE_VERSIONS})
set(_vs_glob_redist_paths "")
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(APPEND _vs_redist_paths ${_vs_glob_redist_paths})
endif()
unset(_vs_glob_redist_paths)
endforeach()
unset(_MSVC_IDE_VERSIONS)
unset(_vs_dir)
else()
get_filename_component(_vs_dir