Merge topic 'vs14-is-2015'

f5afb90d VS: Rename VS 14 generator to 'Visual Studio 14 2015'
This commit is contained in:
Brad King
2014-11-17 09:40:51 -05:00
committed by CMake Topic Stage
5 changed files with 38 additions and 18 deletions
@@ -1,7 +1,7 @@
Visual Studio 14
----------------
Visual Studio 14 2015
---------------------
Generates Visual Studio 14 project files.
Generates Visual Studio 14 (VS 2015) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
to specify a target platform name.
@@ -9,8 +9,8 @@ to specify a target platform name.
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 14 Win64``
``Visual Studio 14 2015 Win64``
Specify target platform ``x64``.
``Visual Studio 14 ARM``
``Visual Studio 14 2015 ARM``
Specify target platform ``ARM``.
+1 -1
View File
@@ -64,7 +64,7 @@ one may launch CMake from any environment.
/generator/Visual Studio 10 2010
/generator/Visual Studio 11 2012
/generator/Visual Studio 12 2013
/generator/Visual Studio 14
/generator/Visual Studio 14 2015
/generator/Xcode
Extra Generators
+1 -1
View File
@@ -18,7 +18,7 @@ New Features
Generators
----------
* A :generator:`Visual Studio 14` generator was added.
* The :generator:`Visual Studio 14 2015` generator was added.
Windows Phone and Windows Store
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^