diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 18:50:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-30 18:50:34 (GMT) |
| commit | 1563668fd0020ee1e2a59b97827468777e3b7955 (patch) | |
| tree | 4a1af74d2b60244fbf9c9c26ef059fb24dfdde59 /Help/variable | |
| parent | 4f7f6651830b847de006bf8bdc5cbd4a9e39805f (diff) | |
| parent | f0e298ad661a82f8368c7adea14e912d36ae8886 (diff) | |
| download | CMake-1563668fd0020ee1e2a59b97827468777e3b7955.zip CMake-1563668fd0020ee1e2a59b97827468777e3b7955.tar.gz CMake-1563668fd0020ee1e2a59b97827468777e3b7955.tar.bz2 | |
Merge topic 'vs14-generator'
f0e298ad Help: Add notes for topic 'vs14-generator'
5c105140 Tests: Simplify LoadCommand tests
b1cbd577 FindBoost: Add -vc140 mangling for VS 14
bdc7d9c8 VS14: Fix Cl and Link flag tables as previous versions
d96b3f68 VS14: Generate flag tables from MSBuild v140 tool files
65624c39 VS14: Add Visual Studio 14 generator (#14982)
8635ac23 Tests/Preprocess: Remove unnecessary VS version tests
Diffstat (limited to 'Help/variable')
| -rw-r--r-- | Help/variable/MSVC14.rst | 6 | ||||
| -rw-r--r-- | Help/variable/MSVC_VERSION.rst | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Help/variable/MSVC14.rst b/Help/variable/MSVC14.rst new file mode 100644 index 0000000..33c782b --- /dev/null +++ b/Help/variable/MSVC14.rst @@ -0,0 +1,6 @@ +MSVC14 +------ + +True when using Microsoft Visual C 14.0 + +Set to true when the compiler is version 14.0 of Microsoft Visual C. diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst index d74114e..ef3b0b5 100644 --- a/Help/variable/MSVC_VERSION.rst +++ b/Help/variable/MSVC_VERSION.rst @@ -3,9 +3,7 @@ MSVC_VERSION The version of Microsoft Visual C/C++ being used if any. -Known version numbers are: - -:: +Known version numbers are:: 1200 = VS 6.0 1300 = VS 7.0 @@ -15,3 +13,4 @@ Known version numbers are: 1600 = VS 10.0 1700 = VS 11.0 1800 = VS 12.0 + 1900 = VS 14.0 |