[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-170-ge74e07f

[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  e74e07ffd1826be46539aa5c7cd864e10aca5f80 (commit)
       via  02b7d278c8cf9ec3012289fcbc673b908b920c89 (commit)
      from  650d0c63e50ff502e9f5fcbf08f885ebb32b6101 (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=e74e07ffd1826be46539aa5c7cd864e10aca5f80
commit e74e07ffd1826be46539aa5c7cd864e10aca5f80
Merge: 650d0c6 02b7d27
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:47:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 6 16:47:20 2016 -0400

    Merge topic 'vs-15-preview-5' into next
    
    02b7d278 VS: Update VS 15 generator for Preview 5


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02b7d278c8cf9ec3012289fcbc673b908b920c89
commit 02b7d278c8cf9ec3012289fcbc673b908b920c89
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:43:50 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 6 16:46:53 2016 -0400

    VS: Update VS 15 generator for Preview 5
    
    The `PlatformToolset` is now `v141` instead of `v140`.
    
    Closes: #16347

diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index f02b62d..d8141ca 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -32,7 +32,7 @@ Generators
   with :ref:`Makefile Generators`.
 
 * The :generator:`Visual Studio 15` generator was added.  This is
-  experimental and based on Preview 4 because this version of VS
+  experimental and based on Preview 5 because this version of VS
   has not been released.
 
 * :ref:`Visual Studio Generators` for VS 2010 and above learned to
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 4d62f2b..a833a5f 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -79,7 +79,7 @@ cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator(
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;"
     "ProductDir",
     vc15Express, cmSystemTools::KeyWOW64_32);
-  this->DefaultPlatformToolset = "v140";
+  this->DefaultPlatformToolset = "v141";
   this->Version = VS15;
 }
 

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

Summary of changes:
 Help/release/3.7.rst                       |    2 +-
 Source/cmGlobalVisualStudio15Generator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake