[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-260-gaacd0cb

[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  aacd0cb0c9deb4f9f9ea78a0fd9320cb32fb5ede (commit)
       via  f582eb753eb746086ef29f6249040f1d7d7e35f9 (commit)
      from  76839b6a522342fd85190cce6bf052140ea2d5af (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=aacd0cb0c9deb4f9f9ea78a0fd9320cb32fb5ede
commit aacd0cb0c9deb4f9f9ea78a0fd9320cb32fb5ede
Merge: 76839b6 f582eb7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 10:34:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 10:34:46 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f582eb753eb746086ef29f6249040f1d7d7e35f9
commit f582eb753eb746086ef29f6249040f1d7d7e35f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 09:46:58 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 10:34:31 2017 -0500

    VS2017: If Win 8.1 SDK is not available, use Win 10 SDK
    
    We try to choose the Windows SDK version based on the version of Windows
    targeted by the build.  However, if using VS 2017 without the Windows
    8.1 SDK installed then we must fall back to the Windows 10 SDK even when
    targeting an older version of Windows.
    
    Inspired-by: gnaggnoyil <gnaggnoyil at gmail.com>

diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index d11ee7c..ac67051 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -109,6 +109,18 @@ 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 781b41e..7240e1a 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -28,6 +28,7 @@ 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:


hooks/post-receive
-- 
CMake