[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-431-g83f2188

[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  83f21887f75b66c99a61e7e1deeabf89d78229d1 (commit)
       via  4a7321a56fd00ec82a25f250828e7621f3c9d9f9 (commit)
      from  bdf70944426e26a269e8930fe7a3bbb4d1590119 (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=83f21887f75b66c99a61e7e1deeabf89d78229d1
commit 83f21887f75b66c99a61e7e1deeabf89d78229d1
Merge: bdf7094 4a7321a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 13:47:29 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 21 13:47:29 2017 -0500

    Merge topic 'vs2017-fallback-sdk' into next
    
    4a7321a5 Revert "VS2017: If Win 8.1 SDK is not available, use Win 10 SDK"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a7321a56fd00ec82a25f250828e7621f3c9d9f9
commit 4a7321a56fd00ec82a25f250828e7621f3c9d9f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 13:47:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 21 13:47:14 2017 -0500

    Revert "VS2017: If Win 8.1 SDK is not available, use Win 10 SDK"
    
    This reverts commit f582eb753eb746086ef29f6249040f1d7d7e35f9.

diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index ac67051..d11ee7c 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -109,18 +109,6 @@ void cmGlobalVisualStudio15Generator::WriteSLNHeader(std::ostream& fout)
   }
 }
 
-bool cmGlobalVisualStudio15Generator::InitializeWindows(cmMakefile* mf)
-{
-  // If the Win 8.1 SDK is installed then we can select a SDK matching
-  // the target Windows version.
-  if (vsSetupAPIHelper.IsWin81SDKInstalled()) {
-    return cmGlobalVisualStudio14Generator::InitializeWindows(mf);
-  }
-  // Otherwise we must choose a Win 10 SDK even if we are not targeting
-  // Windows 10.
-  return this->SelectWindows10SDK(mf, false);
-}
-
 bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset(
   std::string& toolset) const
 {
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h
index 7240e1a..781b41e 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -28,7 +28,6 @@ public:
 
   virtual const char* GetToolsVersion() { return "15.0"; }
 protected:
-  bool InitializeWindows(cmMakefile* mf) CM_OVERRIDE;
   virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
 
   virtual const char* GetIDEVersion() { return "15.0"; }

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

Summary of changes:
 Source/cmGlobalVisualStudio15Generator.cxx |   12 ------------
 Source/cmGlobalVisualStudio15Generator.h   |    1 -
 2 files changed, 13 deletions(-)


hooks/post-receive
-- 
CMake