[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-593-gb4d68f8

[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  b4d68f8c2bae0e813dde174dec397304697717d8 (commit)
       via  0a5164d36da4af84059480257adc617ca4681bad (commit)
      from  5372fb07a7b355f780eb5d7826b0d6e10909c5b3 (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=b4d68f8c2bae0e813dde174dec397304697717d8
commit b4d68f8c2bae0e813dde174dec397304697717d8
Merge: 5372fb0 0a5164d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 16:04:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 16:04:16 2014 -0500

    Merge topic 'vs-check-phone-store-tools' into next
    
    0a5164d3 VS: Improve error messages when compiler is not detected


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a5164d36da4af84059480257adc617ca4681bad
commit 0a5164d36da4af84059480257adc617ca4681bad
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Thu Nov 13 12:44:06 2014 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 13 16:03:53 2014 -0500

    VS: Improve error messages when compiler is not detected
    
    Missed a detection logic in VS 2013

diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 0d99fe1..640010f 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -226,11 +226,10 @@ cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const
   const char desktop81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
                               "VisualStudio\\12.0\\VC\\LibraryDesktop";
 
-  std::string path;
-  cmSystemTools::ReadRegistryValue(desktop81Key,
-                                   path,
-                                   cmSystemTools::KeyWOW64_32);
-  return !path.empty();
+  std::vector<std::string> subkeys;
+  return cmSystemTools::GetRegistrySubKeys(desktop81Key,
+                                           subkeys,
+                                           cmSystemTools::KeyWOW64_32);
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGlobalVisualStudio12Generator.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake