diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:10:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-07 13:10:46 (GMT) |
| commit | fadb812a52bbf14c7b4850e6a5fdd81405d8b5f5 (patch) | |
| tree | 91dfd2f68daebdaa9b5b45a99118f869c76d6d96 | |
| parent | ea563a27a2042cfb3be33d0f74efecc7687b86bb (diff) | |
| parent | 02b7d278c8cf9ec3012289fcbc673b908b920c89 (diff) | |
| download | CMake-fadb812a52bbf14c7b4850e6a5fdd81405d8b5f5.zip CMake-fadb812a52bbf14c7b4850e6a5fdd81405d8b5f5.tar.gz CMake-fadb812a52bbf14c7b4850e6a5fdd81405d8b5f5.tar.bz2 | |
Merge topic 'vs-15-preview-5'
02b7d278 VS: Update VS 15 generator for Preview 5
| -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; } |