[Cmake-commits] CMake branch, next, updated. v3.6.2-1892-g2d65227

[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  2d65227983c95fe9e33efbdc507e9c9fbf605e0f (commit)
       via  861f1b3da65d3eda55e0e1f29d628aa3fb643f70 (commit)
      from  fc294ee3521d42734791b04bc33d18deb5e39383 (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=2d65227983c95fe9e33efbdc507e9c9fbf605e0f
commit 2d65227983c95fe9e33efbdc507e9c9fbf605e0f
Merge: fc294ee 861f1b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 9 10:30:01 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 9 10:30:01 2016 -0400

    Merge topic 'vs-default-v100' into next
    
    861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=861f1b3da65d3eda55e0e1f29d628aa3fb643f70
commit 861f1b3da65d3eda55e0e1f29d628aa3fb643f70
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 9 10:17:23 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 9 10:17:23 2016 -0400

    VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
    
    Since commit 059c230d (VS: Explicitly default to v100 toolset in Visual
    Studio 2010, 2016-07-21) the VS 2010 generator now correctly defaults to
    the v100 toolset instead of no toolset.  However, this broke our logic
    for defaulting to the `Windows7.1SDK` toolset for 64-bit builds on VS
    2010 Express.  Fix the logic by ignoring the `v100` default in the case.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index df831e5..4d8eb6f 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -461,6 +461,10 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
 
 bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
 {
+  if (this->DefaultPlatformToolset == "v100") {
+    // The v100 64-bit toolset does not exist in the express edition.
+    this->DefaultPlatformToolset.clear();
+  }
   if (this->GetPlatformToolset()) {
     return true;
   }

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

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


hooks/post-receive
-- 
CMake