Explorar el Código

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

Brad King hace 9 años
padre
commit
37966a5799
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      Help/release/3.7.rst
  2. 1 1
      Source/cmGlobalVisualStudio15Generator.cxx

+ 1 - 1
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

+ 1 - 1
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;
 }