[Cmake-commits] CMake branch, next, updated. v3.3.1-2722-gaed5df3

[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  aed5df3a0c30c0c726a8305deefaf68c664b5596 (commit)
       via  4b8b91688f2b2fd18a2bda182dd8a1c7a201ff3d (commit)
      from  2bc3f46b84e882e8cd079f9261aa6a8c7e174a07 (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=aed5df3a0c30c0c726a8305deefaf68c664b5596
commit aed5df3a0c30c0c726a8305deefaf68c664b5596
Merge: 2bc3f46 4b8b916
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 10:20:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 10:20:42 2015 -0400

    Merge topic 'vs14-win8-store-phone' into next
    
    4b8b9168 VS: Find Desktop SDK for current VS version (#15662)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b8b91688f2b2fd18a2bda182dd8a1c7a201ff3d
commit 4b8b91688f2b2fd18a2bda182dd8a1c7a201ff3d
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Tue Sep 1 13:52:36 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 10:11:36 2015 -0400

    VS: Find Desktop SDK for current VS version (#15662)
    
    Determine the Desktop SDK for Windows Phone and Windows Store from the
    generator instead of the version of the targeted app.  This allows to
    build a Windows Phone 8.1 app on VS 2015 for example.

diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h
index b50f4c9..9499d80 100644
--- a/Source/cmGlobalVisualStudio11Generator.h
+++ b/Source/cmGlobalVisualStudio11Generator.h
@@ -34,9 +34,12 @@ protected:
   virtual bool SelectWindowsPhoneToolset(std::string& toolset) const;
   virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
 
+  // Used to verify that the Desktop toolset for the current generator is
+  // installed on the machine.
+  virtual bool IsWindowsDesktopToolsetInstalled() const;
+
   // These aren't virtual because we need to check if the selected version
   // of the toolset is installed
-  bool IsWindowsDesktopToolsetInstalled() const;
   bool IsWindowsPhoneToolsetInstalled() const;
   bool IsWindowsStoreToolsetInstalled() const;
 
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h
index bce9e0c..a7939aa 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -38,9 +38,12 @@ protected:
   virtual bool SelectWindowsPhoneToolset(std::string& toolset) const;
   virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
 
+  // Used to verify that the Desktop toolset for the current generator is
+  // installed on the machine.
+  virtual bool IsWindowsDesktopToolsetInstalled() const;
+
   // These aren't virtual because we need to check if the selected version
   // of the toolset is installed
-  bool IsWindowsDesktopToolsetInstalled() const;
   bool IsWindowsPhoneToolsetInstalled() const;
   bool IsWindowsStoreToolsetInstalled() const;
   virtual const char* GetIDEVersion() { return "12.0"; }
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 2cf55d4..d73eedf 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -124,3 +124,16 @@ void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
     fout << "# Visual Studio 14\n";
     }
 }
+
+//----------------------------------------------------------------------------
+bool
+cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
+{
+  const char desktop10Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\14.0\\VC\\Runtimes";
+
+  std::vector<std::string> vc14;
+  return cmSystemTools::GetRegistrySubKeys(desktop10Key,
+    vc14, cmSystemTools::KeyWOW64_32);
+}
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index aa817be..02c6274 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -31,6 +31,11 @@ public:
   virtual const char* GetToolsVersion() { return "14.0"; }
 protected:
   virtual const char* GetIDEVersion() { return "14.0"; }
+
+  // Used to verify that the Desktop toolset for the current generator is
+  // installed on the machine.
+  virtual bool IsWindowsDesktopToolsetInstalled() const;
+
 private:
   class Factory;
 };

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

Summary of changes:
 Source/cmGlobalVisualStudio11Generator.h   |    5 ++++-
 Source/cmGlobalVisualStudio12Generator.h   |    5 ++++-
 Source/cmGlobalVisualStudio14Generator.cxx |   13 +++++++++++++
 Source/cmGlobalVisualStudio14Generator.h   |    5 +++++
 4 files changed, 26 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake