From 6eb609fd59d989fede93fadfc67b928ee7ab7fc2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 27 Mar 2017 11:42:48 -0400 Subject: InstallRequiredSystemLibraries: Find VS 2017 redist directory 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 --- Modules/InstallRequiredSystemLibraries.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 9750a06..a3478a3 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -196,6 +196,11 @@ 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() + unset(_vs_dir) else() get_filename_component(_vs_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${vs}.0;InstallDir]" ABSOLUTE) -- cgit v0.12