summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-09-28 14:40:25 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-09-28 14:40:32 (GMT)
commit43a0206dad9cc677f140c43ddcfcb626d923567d (patch)
tree6d41f0e6a2932dafb8679811d88f5c56f972bb66 /Help
parentb9968f3006cc1d072eb6a9afebc44a56016b2fcb (diff)
parent6c1337cb79341ec0f9aac617419b6311b6d601af (diff)
downloadCMake-43a0206dad9cc677f140c43ddcfcb626d923567d.zip
CMake-43a0206dad9cc677f140c43ddcfcb626d923567d.tar.gz
CMake-43a0206dad9cc677f140c43ddcfcb626d923567d.tar.bz2
Merge topic 'vs11-deprecate'
6c1337cb79 Deprecate Visual Studio 11 2012 generator 5faf145a5b Tests: Drop unused files from RunCMake.CommandLine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7720
Diffstat (limited to 'Help')
-rw-r--r--Help/generator/Visual Studio 10 2010.rst2
-rw-r--r--Help/generator/Visual Studio 11 2012.rst9
-rw-r--r--Help/release/dev/vs11-deprecate.rst5
3 files changed, 14 insertions, 2 deletions
diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst
index ee44514..888164f 100644
--- a/Help/generator/Visual Studio 10 2010.rst
+++ b/Help/generator/Visual Studio 10 2010.rst
@@ -3,6 +3,6 @@ Visual Studio 10 2010
Removed. This once generated Visual Studio 10 2010 project files, but
the generator has been removed since CMake 3.25. It is still possible
-to build with VS 10 2010 tools using the :generator:`Visual Studio 11 2012`
+to build with VS 10 2010 tools using the :generator:`Visual Studio 12 2013`
(or above) generator with :variable:`CMAKE_GENERATOR_TOOLSET` set to
``v100``, or by using the :generator:`NMake Makefiles` generator.
diff --git a/Help/generator/Visual Studio 11 2012.rst b/Help/generator/Visual Studio 11 2012.rst
index adbd1af..4e7195c 100644
--- a/Help/generator/Visual Studio 11 2012.rst
+++ b/Help/generator/Visual Studio 11 2012.rst
@@ -1,7 +1,14 @@
Visual Studio 11 2012
---------------------
-Generates Visual Studio 11 (VS 2012) project files.
+Deprecated. Generates Visual Studio 11 (VS 2012) project files.
+
+.. note::
+ This generator is deprecated and will be removed in a future version
+ of CMake. It will still be possible to build with VS 11 2012 tools
+ using the :generator:`Visual Studio 12 2013` (or above) generator
+ with :variable:`CMAKE_GENERATOR_TOOLSET` set to ``v110``, or by
+ using the :generator:`NMake Makefiles` generator.
For compatibility with CMake versions prior to 3.0, one may specify this
generator using the name "Visual Studio 11" without the year component.
diff --git a/Help/release/dev/vs11-deprecate.rst b/Help/release/dev/vs11-deprecate.rst
new file mode 100644
index 0000000..2ee69bb
--- /dev/null
+++ b/Help/release/dev/vs11-deprecate.rst
@@ -0,0 +1,5 @@
+vs11-deprecate
+--------------
+
+* The :generator:`Visual Studio 11 2012` generator is now deprecated
+ and will be removed in a future version of CMake.