[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2741-g5c4ee10

[Ben Boeckel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883 (commit)
       via  6dd97aa153dabcf5948f6acf435733097e39feb4 (commit)
      from  0fa034f4df204a58bb4a6278308589ec29fe2cb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883
commit 5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883
Merge: 0fa034f 6dd97aa
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 15:44:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 15:44:16 2014 -0400

    Merge topic 'dev/faster-evis' into next
    
    6dd97aa1 Windows: Avoid () in environment names


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dd97aa153dabcf5948f6acf435733097e39feb4
commit 6dd97aa153dabcf5948f6acf435733097e39feb4
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 15:44:43 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 15:44:43 2014 -0400

    Windows: Avoid () in environment names
    
    Use a redirection.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 4b551e6..808e153 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)")

-----------------------------------------------------------------------

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |    3 ++-
 Modules/Platform/WindowsPaths.cmake          |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake