summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-26 12:10:00 +0000
committerKitware Robot <kwrobot@kitware.com>2017-09-26 08:10:06 -0400
commitc40d130034278e28964929e8d61f3280945b7531 (patch)
tree561e625c3ff0a7b5a762be04461e9ef4d06f4e58 /Help
parentff76f89475d0d0e8772c44951e871e9dcfa0bd3f (diff)
parent0741b6e2261e583af9eaefd06ffa8f689f277d7d (diff)
downloadcmake-c40d130034278e28964929e8d61f3280945b7531.tar.gz
Merge topic 'doc-MSVC_VERSION'
0741b6e2 Help: Update MSVC_VERSION documentation 00d9dd95 Help: Document MSVC_VERSION value 1911 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1310
Diffstat (limited to 'Help')
-rw-r--r--Help/variable/MSVC_VERSION.rst22
1 files changed, 12 insertions, 10 deletions
diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst
index 8932147c65..0a3a7a6947 100644
--- a/Help/variable/MSVC_VERSION.rst
+++ b/Help/variable/MSVC_VERSION.rst
@@ -5,13 +5,15 @@ The version of Microsoft Visual C/C++ being used if any.
Known version numbers are::
- 1200 = VS 6.0
- 1300 = VS 7.0
- 1310 = VS 7.1
- 1400 = VS 8.0
- 1500 = VS 9.0
- 1600 = VS 10.0
- 1700 = VS 11.0
- 1800 = VS 12.0
- 1900 = VS 14.0
- 1910 = VS 15.0
+ 1200 = VS 6.0
+ 1300 = VS 7.0
+ 1310 = VS 7.1
+ 1400 = VS 8.0 (v80 toolset)
+ 1500 = VS 9.0 (v90 toolset)
+ 1600 = VS 10.0 (v100 toolset)
+ 1700 = VS 11.0 (v110 toolset)
+ 1800 = VS 12.0 (v120 toolset)
+ 1900 = VS 14.0 (v140 toolset)
+ 1910-1919 = VS 15.0 (v141 toolset)
+
+See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.