[Cmake-commits] CMake branch, next, updated. v3.7.1-1633-gbfb872f

[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  bfb872f8252d25833824e062e396a0f0c7df1b10 (commit)
       via  b4e97ca94a4b549785be67de0c95d6aa54d59cc6 (commit)
      from  ca59b4beca14ce465fc68cedeb3ab83c279de8fe (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=bfb872f8252d25833824e062e396a0f0c7df1b10
commit bfb872f8252d25833824e062e396a0f0c7df1b10
Merge: ca59b4b b4e97ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:08:45 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 7 11:08:45 2016 -0500

    Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset' into next
    
    b4e97ca9 Revert topic 'vs-fix-standalone-Windows7.1SDK-toolset'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4e97ca94a4b549785be67de0c95d6aa54d59cc6
commit b4e97ca94a4b549785be67de0c95d6aa54d59cc6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:08:27 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 7 11:08:27 2016 -0500

    Revert topic 'vs-fix-standalone-Windows7.1SDK-toolset'
    
    It will be revised with another approach.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index a1e328e..caaac87 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -126,7 +126,7 @@ bool cmGlobalVisualStudio10Generator::SetGeneratorPlatform(
   }
   if (this->GetPlatformName() == "Itanium" ||
       this->GetPlatformName() == "x64") {
-    if (!this->Find64BitTools(mf)) {
+    if (this->IsExpressEdition() && !this->Find64BitTools(mf)) {
       return false;
     }
   }
@@ -474,19 +474,10 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
 bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
 {
   if (this->DefaultPlatformToolset == "v100") {
-    std::string env;
-    if (cmSystemTools::GetEnv("PlatformToolset", env) &&
-        env == "Windows7.1SDK") {
-      // We are running from a Windows7.1SDK command prompt.
-      this->DefaultPlatformToolset = "Windows7.1SDK";
-    } else if (this->IsExpressEdition()) {
-      // The v100 64-bit toolset does not exist in the express edition.
-      this->DefaultPlatformToolset.clear();
-    }
+    // The v100 64-bit toolset does not exist in the express edition.
+    this->DefaultPlatformToolset.clear();
   }
-  // Find the Windows7.1SDK tools when using the express edition
-  // and no specified or default toolset has been selected.
-  if (!this->IsExpressEdition() || this->GetPlatformToolset()) {
+  if (this->GetPlatformToolset()) {
     return true;
   }
   // This edition does not come with 64-bit tools.  Look for them.

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

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake