[Cmake-commits] CMake branch, next, updated. v2.8.4-1126-g3fed422

[David Cole]

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  3fed422ac5dd3b3b1f60a7afe24638b038a817e4 (commit)
       via  971a735ba2b4d9e4ac846722fdf280dbd0feb0d4 (commit)
      from  6c10df2ed2c53263babf53182843302172a66f52 (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=3fed422ac5dd3b3b1f60a7afe24638b038a817e4
commit 3fed422ac5dd3b3b1f60a7afe24638b038a817e4
Merge: 6c10df2 971a735
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Mar 9 18:17:04 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 9 18:17:04 2011 -0500

    Merge topic 'fix-InstallReqdSysLibs-again' into next
    
    971a735 InstallRequiredSystemLibraries: Read reg values with get_filename_component


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=971a735ba2b4d9e4ac846722fdf280dbd0feb0d4
commit 971a735ba2b4d9e4ac846722fdf280dbd0feb0d4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Mar 9 18:03:11 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Mar 9 18:03:11 2011 -0500

    InstallRequiredSystemLibraries: Read reg values with get_filename_component
    
    64-bit CMake can now find the VC redist folder.
    
    See this thread on the CMake mailing list for the original report:
    http://www.cmake.org/pipermail/cmake/2011-March/043342.html
    
    Thanks to J. Decker for the suggested fix.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 2dfe8b1..59e5ec1 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -70,9 +70,11 @@ IF(MSVC)
 
   IF(MSVC80)
     # Find the runtime library redistribution directory.
+    GET_FILENAME_COMPONENT(msvc_install_dir
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]" ABSOLUTE)
     FIND_PATH(MSVC80_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
       PATHS
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist"
+        "${msvc_install_dir}/../../VC/redist"
         "${base_dir}/VC/redist"
       )
     MARK_AS_ADVANCED(MSVC80_REDIST_DIR)
@@ -103,10 +105,14 @@ IF(MSVC)
 
   IF(MSVC90)
     # Find the runtime library redistribution directory.
+    GET_FILENAME_COMPONENT(msvc_install_dir
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]" ABSOLUTE)
+    GET_FILENAME_COMPONENT(msvc_express_install_dir
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]" ABSOLUTE)
     FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
       PATHS
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]/../../VC/redist"
+        "${msvc_install_dir}/../../VC/redist"
+        "${msvc_express_install_dir}/../../VC/redist"
         "${base_dir}/VC/redist"
       )
     MARK_AS_ADVANCED(MSVC90_REDIST_DIR)
@@ -137,9 +143,11 @@ IF(MSVC)
 
   IF(MSVC10)
     # Find the runtime library redistribution directory.
+    GET_FILENAME_COMPONENT(msvc_install_dir
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]" ABSOLUTE)
     FIND_PATH(MSVC10_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC100.CRT
       PATHS
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]/../../VC/redist"
+        "${msvc_install_dir}/../../VC/redist"
         "${base_dir}/VC/redist"
         "$ENV{ProgramFiles}/Microsoft Visual Studio 10.0/VC/redist"
         "$ENV{ProgramFiles(x86)}/Microsoft Visual Studio 10.0/VC/redist"

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake