mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs15-rename-generator-for-master'

Browse Source 
31e013ae Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master
d639620e VS: Rename VS 15 generator to 'Visual Studio 15 2017'
This commit is contained in:
Brad King
2016-11-30 08:37:11 -05:00
committed by CMake Topic Stage
parent 996e5237ca 31e013ae60
commit 4288708cba
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Help/generator/Visual Studio 15.rst → Help/generator/Visual Studio 15 2017.rst
View File

@@ -1,7 +1,7 @@
Visual Studio 15
----------------
Visual Studio 15 2017
---------------------
Generates Visual Studio 15 project files.
Generates Visual Studio 15 (VS 2017) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
to specify a target platform name (architecture).
@@ -9,16 +9,16 @@ to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
``Visual Studio 15 Win64``
``Visual Studio 15 2017 Win64``
Specify target platform ``x64``.
``Visual Studio 15 ARM``
``Visual Studio 15 2017 ARM``
Specify target platform ``ARM``.
Toolset Selection
^^^^^^^^^^^^^^^^^
The ``v141`` toolset that comes with Visual Studio 15 is selected by
The ``v141`` toolset that comes with Visual Studio 15 2017 is selected by
default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.

2
Help/manual/cmake-generators.7.rst
View File

@@ -82,7 +82,7 @@ Visual Studio Generators
/generator/Visual Studio 11 2012
/generator/Visual Studio 12 2013
/generator/Visual Studio 14 2015
/generator/Visual Studio 15
/generator/Visual Studio 15 2017
Other Generators
^^^^^^^^^^^^^^^^

6
Help/release/3.7.rst
View File

@@ -31,9 +31,9 @@ Generators
This is equivalent to ``cd sub/dir; make {test,install,package}``
with :ref:`Makefile Generators`.
* The :generator:`Visual Studio 15` generator was added. This is
experimental and based on Preview 5 because this version of VS
has not been released.
* The :generator:`Visual Studio 15 2017` generator was added. This is
experimental and based on "Visual Studio 2017 RC" because this version
of VS has not been released.
* :ref:`Visual Studio Generators` for VS 2010 and above learned to
place ``.natvis`` source files into VS project files properly.