diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-29 15:50:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-29 15:51:35 (GMT) |
| commit | 31e013ae6066067433676c21b8698256404d64f1 (patch) | |
| tree | 627bea433b75be3c41f980c4b9b89bedffd7c25d /Help/generator | |
| parent | 2f7e05fbc20150377668a4ea1b114fd1b4d92df6 (diff) | |
| parent | d639620e14cb25a3bc8039bc2a50bf402b8d2f79 (diff) | |
| download | CMake-31e013ae6066067433676c21b8698256404d64f1.zip CMake-31e013ae6066067433676c21b8698256404d64f1.tar.gz CMake-31e013ae6066067433676c21b8698256404d64f1.tar.bz2 | |
Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master
Diffstat (limited to 'Help/generator')
| -rw-r--r-- | Help/generator/Visual Studio 15 2017.rst (renamed from Help/generator/Visual Studio 15.rst) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Help/generator/Visual Studio 15.rst b/Help/generator/Visual Studio 15 2017.rst index 2eb9052..a88f8bc 100644 --- a/Help/generator/Visual Studio 15.rst +++ b/Help/generator/Visual Studio 15 2017.rst @@ -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. |