summaryrefslogtreecommitdiffstats
path: root/Help/manual/cmake-generators.7.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-08 13:36:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-08 13:36:54 (GMT)
commit988b3806b6ad2f28ebd6b582ce18928407d0b011 (patch)
tree8445c3bf6d14c67665ee12e0da325b0756665c13 /Help/manual/cmake-generators.7.rst
parent04657ee2f83cb446c5595090f256273a23be94a2 (diff)
parentbdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (diff)
downloadCMake-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/manual/cmake-generators.7.rst')
-rw-r--r--Help/manual/cmake-generators.7.rst1
1 files changed, 1 insertions, 0 deletions
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
^^^^^^^^^^^^^^^^