[Cmake-commits] CMake branch, next, updated. v3.6.0-958-gf70568b

[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  f70568b0bec005bae9ebef98214b6b508c98f03c (commit)
       via  059c230d89b2f5c82423fc6458302620f4b09599 (commit)
      from  db57986bf5722035dd62103dd8124aa7f67acb9e (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=f70568b0bec005bae9ebef98214b6b508c98f03c
commit f70568b0bec005bae9ebef98214b6b508c98f03c
Merge: db57986 059c230
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 21 11:22:25 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 21 11:22:25 2016 -0400

    Merge topic 'vs-default-v100' into next
    
    059c230d VS: Explicitly default to v100 toolset in Visual Studio 2010


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=059c230d89b2f5c82423fc6458302620f4b09599
commit 059c230d89b2f5c82423fc6458302620f4b09599
Author:     Benjamin Ballet <bballet at ivsweb.com>
AuthorDate: Thu Jul 21 10:43:36 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 21 11:13:16 2016 -0400

    VS: Explicitly default to v100 toolset in Visual Studio 2010
    
    Otherwise `CMAKE_VS_PLATFORM_TOOLSET` is not set even though the `v100`
    toolset is chosen.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index c13c622..df831e5 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -101,6 +101,7 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
   this->SystemIsWindowsPhone = false;
   this->SystemIsWindowsStore = false;
   this->MSBuildCommandInitialized = false;
+  this->DefaultPlatformToolset = "v100";
   this->Version = VS10;
 }
 

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

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


hooks/post-receive
-- 
CMake