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

InstallRequiredSystemLibraries: Find VS 2017 redist directory

Browse Source 
Use our undocumented `cmake_host_system_information` query to find the
VS 2017 installation directory by asking the VS installer tool.  Then
look relative to that for the redist directory.

Fixes: #16737
This commit is contained in:
Brad King
2017-03-27 11:42:48 -04:00
parent cf784d9ff5
commit 6eb609fd59
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -196,6 +196,11 @@ if(MSVC)
endif() endif()
if(NOT vs VERSION_LESS 15) if(NOT vs VERSION_LESS 15)
set(_vs_redist_paths "") 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()
unset(_vs_dir)
else() else()
get_filename_component(_vs_dir get_filename_component(_vs_dir
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${vs}.0;InstallDir]" ABSOLUTE) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${vs}.0;InstallDir]" ABSOLUTE)