kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'vs-15-preview-5' into release

This commit is contained in:
Brad King 2016-11-18 11:43:43 -05:00
parent 9fd9fd9861 02b7d278c8
commit 37966a5799
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/release/3.7.rst
View File

@ -32,7 +32,7 @@ Generators
with :ref:`Makefile Generators`. with :ref:`Makefile Generators`.
* The :generator:`Visual Studio 15` generator was added. This is * 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. has not been released.
* :ref:`Visual Studio Generators` for VS 2010 and above learned to * :ref:`Visual Studio Generators` for VS 2010 and above learned to

2
Source/cmGlobalVisualStudio15Generator.cxx
View File

@ -79,7 +79,7 @@ cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;" "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;"
"ProductDir", "ProductDir",
vc15Express, cmSystemTools::KeyWOW64_32); vc15Express, cmSystemTools::KeyWOW64_32);
this->DefaultPlatformToolset = "v140"; this->DefaultPlatformToolset = "v141";
this->Version = VS15; this->Version = VS15;
} }