diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-08 13:36:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-08 13:36:54 (GMT) |
| commit | 988b3806b6ad2f28ebd6b582ce18928407d0b011 (patch) | |
| tree | 8445c3bf6d14c67665ee12e0da325b0756665c13 /Help | |
| parent | 04657ee2f83cb446c5595090f256273a23be94a2 (diff) | |
| parent | bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (diff) | |
| download | CMake-988b3806b6ad2f28ebd6b582ce18928407d0b011.zip CMake-988b3806b6ad2f28ebd6b582ce18928407d0b011.tar.gz CMake-988b3806b6ad2f28ebd6b582ce18928407d0b011.tar.bz2 | |
Merge topic 'vs-15-generator'
bdc679a8 VS15: Add Visual Studio 15 generator
a8936656 VS: Update v140 flag tables from VS 15 MSBuild files
21346d3f Features: Record features for VS 15 Preview 4
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Visual Studio 15.rst | 16 | ||||
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/vs-15-generator.rst | 4 | ||||
| -rw-r--r-- | Help/variable/MSVC_VERSION.rst | 2 |
4 files changed, 22 insertions, 1 deletions
diff --git a/Help/generator/Visual Studio 15.rst b/Help/generator/Visual Studio 15.rst new file mode 100644 index 0000000..2b9e33a --- /dev/null +++ b/Help/generator/Visual Studio 15.rst @@ -0,0 +1,16 @@ +Visual Studio 15 +---------------- + +Generates Visual Studio 15 project files. + +The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set +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 15 Win64`` + Specify target platform ``x64``. + +``Visual Studio 15 ARM`` + Specify target platform ``ARM``. diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index cde8de8..3df3a81 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -82,6 +82,7 @@ Visual Studio Generators /generator/Visual Studio 11 2012 /generator/Visual Studio 12 2013 /generator/Visual Studio 14 2015 + /generator/Visual Studio 15 Other Generators ^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/vs-15-generator.rst b/Help/release/dev/vs-15-generator.rst new file mode 100644 index 0000000..be40cbc --- /dev/null +++ b/Help/release/dev/vs-15-generator.rst @@ -0,0 +1,4 @@ +vs-15-generator +--------------- + +* The :generator:`Visual Studio 15` generator was added. diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst index ef3b0b5..e2aff3c9 100644 --- a/Help/variable/MSVC_VERSION.rst +++ b/Help/variable/MSVC_VERSION.rst @@ -13,4 +13,4 @@ Known version numbers are:: 1600 = VS 10.0 1700 = VS 11.0 1800 = VS 12.0 - 1900 = VS 14.0 + 1900 = VS 14.0, 15.0 |