[Cmake-commits] CMake branch, next, updated. v3.7.1-1636-ga43fa8e

[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  a43fa8ec70b589cb1794850cdeb147c271f88066 (commit)
       via  d42d3780ac1d62c7733affb9fd168a4e803634a2 (commit)
       via  27431de1627d95329712f4af8362fcaf2667aad5 (commit)
      from  bfb872f8252d25833824e062e396a0f0c7df1b10 (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=a43fa8ec70b589cb1794850cdeb147c271f88066
commit a43fa8ec70b589cb1794850cdeb147c271f88066
Merge: bfb872f d42d378
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:17:38 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 7 11:17:38 2016 -0500

    Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset-for-master' into next
    
    d42d3780 Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master
    27431de1 VS: Fix standalone Windows7.1SDK toolset selection


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d42d3780ac1d62c7733affb9fd168a4e803634a2
commit d42d3780ac1d62c7733affb9fd168a4e803634a2
Merge: a0d64ec 27431de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:10:28 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 7 11:10:28 2016 -0500

    Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master

diff --cc Source/cmGlobalVisualStudio10Generator.cxx
index d992aef,502c93a..dde6e82
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@@ -98,13 -93,16 +98,22 @@@ cmGlobalVisualStudio10Generator::cmGlob
    this->SystemIsWindowsPhone = false;
    this->SystemIsWindowsStore = false;
    this->MSBuildCommandInitialized = false;
-   this->DefaultPlatformToolset = "v100";
+   {
+     std::string envPlatformToolset;
+     if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) &&
+         envPlatformToolset == "Windows7.1SDK") {
+       // We are running from a Windows7.1SDK command prompt.
+       this->DefaultPlatformToolset = "Windows7.1SDK";
+     } else {
+       this->DefaultPlatformToolset = "v100";
+     }
+   }
 +  this->DefaultClFlagTable = cmVS10CLFlagTable;
 +  this->DefaultCSharpFlagTable = cmVS10CSharpFlagTable;
 +  this->DefaultLibFlagTable = cmVS10LibFlagTable;
 +  this->DefaultLinkFlagTable = cmVS10LinkFlagTable;
 +  this->DefaultMasmFlagTable = cmVS10MASMFlagTable;
 +  this->DefaultRcFlagTable = cmVS10RCFlagTable;
    this->Version = VS10;
  }
  

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27431de1627d95329712f4af8362fcaf2667aad5
commit 27431de1627d95329712f4af8362fcaf2667aad5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 10:38:18 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 7 11:02:54 2016 -0500

    VS: Fix standalone Windows7.1SDK toolset selection
    
    Since commit v3.7.0-rc1~142^2~1 (VS: Explicitly default to v100 toolset
    in Visual Studio 2010, 2016-07-21) we prefer to always set a platform
    toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported.
    However, the `v100` default for the VS 10 generator is not appropriate
    for all environments.  We fixed support for VS 2010 Express Edition in
    commit v3.7.0-rc1~142^2 (VS: Do not default to missing v100 64-bit
    toolset on VS 2010 Express, 2016-09-09).
    
    Fix support for the standalone Windows7.1SDK toolset environment by
    recognizing the `PlatformToolset` environment variable that it sets to
    `Windows7.1SDK` and using this as our default toolset instead.
    
    Closes: #16483

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index caaac87..502c93a 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -93,7 +93,16 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
   this->SystemIsWindowsPhone = false;
   this->SystemIsWindowsStore = false;
   this->MSBuildCommandInitialized = false;
-  this->DefaultPlatformToolset = "v100";
+  {
+    std::string envPlatformToolset;
+    if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) &&
+        envPlatformToolset == "Windows7.1SDK") {
+      // We are running from a Windows7.1SDK command prompt.
+      this->DefaultPlatformToolset = "Windows7.1SDK";
+    } else {
+      this->DefaultPlatformToolset = "v100";
+    }
+  }
   this->Version = VS10;
 }
 

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

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake