[Cmake-commits] CMake branch, next, updated. v3.5.2-1555-g3f65c7d

[Brad King]

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  3f65c7d72b09cb6bfa4265a568bb9f2469773bd4 (commit)
       via  c9cebed5d8da8615d820dafb3cb6cfa6731b4ff4 (commit)
      from  03655800e9142fd2e0b8a1db025fb5751a9009b3 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f65c7d72b09cb6bfa4265a568bb9f2469773bd4
commit 3f65c7d72b09cb6bfa4265a568bb9f2469773bd4
Merge: 0365580 c9cebed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 25 09:06:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 09:06:52 2016 -0400

    Merge topic 'GetPrerequisites-more-paths' into next
    
    c9cebed5 GetPrerequisites: Look for VS tools using registry entries (#16108)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9cebed5d8da8615d820dafb3cb6cfa6731b4ff4
commit c9cebed5d8da8615d820dafb3cb6cfa6731b4ff4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 25 09:00:33 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 25 09:00:33 2016 -0400

    GetPrerequisites: Look for VS tools using registry entries (#16108)

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index dd294f4..375349f 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -663,20 +663,27 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
   endif()
 
   set(gp_cmd_paths ${gp_cmd_paths}
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0;InstallDir]/../../VC/bin"
     "$ENV{VS140COMNTOOLS}/../../VC/bin"
     "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]/../../VC/bin"
     "$ENV{VS120COMNTOOLS}/../../VC/bin"
     "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]/../../VC/bin"
     "$ENV{VS110COMNTOOLS}/../../VC/bin"
     "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]/../../VC/bin"
     "$ENV{VS100COMNTOOLS}/../../VC/bin"
     "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/bin"
     "$ENV{VS90COMNTOOLS}/../../VC/bin"
     "C:/Program Files/Microsoft Visual Studio 9.0/VC/bin"
     "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/bin"
     "$ENV{VS80COMNTOOLS}/../../VC/bin"
     "C:/Program Files/Microsoft Visual Studio 8/VC/BIN"
     "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1;InstallDir]/../../VC7/bin"
     "$ENV{VS71COMNTOOLS}/../../VC7/bin"
     "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
     "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake