From e423f1c05d6d11483deb7acd135623df8de45655 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 2 May 2014 15:44:43 -0400 Subject: Windows: Avoid () in environment variable references Use nested variable evaluation instead. --- Modules/InstallRequiredSystemLibraries.cmake | 3 ++- Modules/Platform/WindowsPaths.cmake | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 307aafc..5c439e9 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -157,7 +157,8 @@ if(MSVC) "${msvc_install_dir}/../../VC/redist" "${base_dir}/VC/redist" "$ENV{ProgramFiles}/Microsoft Visual Studio ${v}.0/VC/redist" - "$ENV{ProgramFiles(x86)}/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) set(MSVC${v}_CRT_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.CRT") diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake index 3240c23..658de3b 100644 --- a/Modules/Platform/WindowsPaths.cmake +++ b/Modules/Platform/WindowsPaths.cmake @@ -56,9 +56,10 @@ else() if(DEFINED "ENV{ProgramFiles}") list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles}") endif() - if(DEFINED "ENV{ProgramFiles(x86)}") + set(programfilesx86 "ProgramFiles(x86)") + if(DEFINED "ENV{${programfilesx86}}") # 64-bit binary. 32-bit program files are in ProgramFiles(x86). - list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles(x86)}") + list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{${programfilesx86}}") elseif(DEFINED "ENV{SystemDrive}") # Guess the 32-bit program files location. if(EXISTS "$ENV{SystemDrive}/Program Files (x86)") -- cgit v0.12