From bbf8c03b4f04ffcf2bd96b6408e4fa3598b2526f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 12 May 2016 10:54:59 -0400 Subject: [PATCH] InstallRequiredSystemLibraries: Fix ENV{ProgramFiles(x86)} reference The fix in commit v3.1.0-rc1~544^2~5 (Windows: Avoid () in environment variable references, 2014-05-02) introduced a set() command in the middle of an argument list. Move it to before the find_path() call. --- Modules/InstallRequiredSystemLibraries.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 2ff9aed4b..89f3d50c3 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -171,12 +171,12 @@ if(MSVC) # Find the runtime library redistribution directory. get_filename_component(msvc_install_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${v}.0;InstallDir]" ABSOLUTE) + set(programfilesx86 "ProgramFiles(x86)") find_path(MSVC${v}_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.CRT PATHS "${msvc_install_dir}/../../VC/redist" "${base_dir}/VC/redist" "$ENV{ProgramFiles}/Microsoft Visual Studio ${v}.0/VC/redist" - set(programfilesx86 "ProgramFiles(x86)") "$ENV{${programfilesx86}}/Microsoft Visual Studio ${v}.0/VC/redist" ) mark_as_advanced(MSVC${v}_REDIST_DIR)