diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-18 16:43:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-18 16:43:43 (GMT) |
| commit | 37966a57992a8a2cc59fd663a4dea985a0be248c (patch) | |
| tree | cbffd790acd3516f99d26cff1982957788667786 | |
| parent | 9fd9fd9861b208e31b90e72c368f411635fb7270 (diff) | |
| parent | 02b7d278c8cf9ec3012289fcbc673b908b920c89 (diff) | |
| download | CMake-37966a57992a8a2cc59fd663a4dea985a0be248c.zip CMake-37966a57992a8a2cc59fd663a4dea985a0be248c.tar.gz CMake-37966a57992a8a2cc59fd663a4dea985a0be248c.tar.bz2 | |
Merge branch 'vs-15-preview-5' into release
| -rw-r--r-- | Help/release/3.7.rst | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio15Generator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst index 9794267..3b8ade6 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; } |