diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-17 14:44:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-17 14:44:52 (GMT) |
| commit | 598a316154922f27f987d0f7a78b28ab78a85be6 (patch) | |
| tree | 860a0c9a49e23963e0f8c77bbcdc68b6c25ba457 /Help | |
| parent | ec34b4b8f732c06b9dd43a401f5513033bd6198d (diff) | |
| parent | f5afb90d7c0ff756dedc3d473c0fb60dee004d82 (diff) | |
| download | CMake-598a316154922f27f987d0f7a78b28ab78a85be6.zip CMake-598a316154922f27f987d0f7a78b28ab78a85be6.tar.gz CMake-598a316154922f27f987d0f7a78b28ab78a85be6.tar.bz2 | |
Merge branch 'vs14-is-2015' into release
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Visual Studio 14 2015.rst (renamed from Help/generator/Visual Studio 14.rst) | 10 | ||||
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.1.0.rst | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Help/generator/Visual Studio 14.rst b/Help/generator/Visual Studio 14 2015.rst index d621b7e..b35997a 100644 --- a/Help/generator/Visual Studio 14.rst +++ b/Help/generator/Visual Studio 14 2015.rst @@ -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``. diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index 4bc8c5f..bda7eef 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -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 diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst index 65aae00..101c29d 100644 --- a/Help/release/3.1.0.rst +++ b/Help/release/3.1.0.rst @@ -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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |