diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 14:50:34 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-30 14:50:34 -0400 |
| commit | 1563668fd0020ee1e2a59b97827468777e3b7955 (patch) | |
| tree | 4a1af74d2b60244fbf9c9c26ef059fb24dfdde59 /Help | |
| parent | 4f7f6651830b847de006bf8bdc5cbd4a9e39805f (diff) | |
| parent | f0e298ad661a82f8368c7adea14e912d36ae8886 (diff) | |
| download | cmake-1563668fd0020ee1e2a59b97827468777e3b7955.tar.gz | |
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')
| -rw-r--r-- | Help/generator/Visual Studio 14.rst | 9 | ||||
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/vs14-generator.rst | 4 | ||||
| -rw-r--r-- | Help/variable/MSVC14.rst | 6 | ||||
| -rw-r--r-- | Help/variable/MSVC_VERSION.rst | 5 |
6 files changed, 23 insertions, 3 deletions
diff --git a/Help/generator/Visual Studio 14.rst b/Help/generator/Visual Studio 14.rst new file mode 100644 index 0000000000..7f4fdc3ae1 --- /dev/null +++ b/Help/generator/Visual Studio 14.rst @@ -0,0 +1,9 @@ +Visual Studio 14 +---------------- + +Generates Visual Studio 14 project files. + +It is possible to append a space followed by the platform name to +create project files for a specific target platform. E.g. +"Visual Studio 14 Win64" will create project files for the +x64 processor; "Visual Studio 14 ARM" for ARM. diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index 8d0c70418c..7f5093f0c8 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -64,6 +64,7 @@ one may launch CMake from any environment. /generator/Visual Studio 10 2010 /generator/Visual Studio 11 2012 /generator/Visual Studio 12 2013 + /generator/Visual Studio 14 /generator/Xcode Extra Generators diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 0e4c4a062c..983bf2276b 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -179,6 +179,7 @@ Variables that Describe the System /variable/MSVC10 /variable/MSVC11 /variable/MSVC12 + /variable/MSVC14 /variable/MSVC60 /variable/MSVC70 /variable/MSVC71 diff --git a/Help/release/dev/vs14-generator.rst b/Help/release/dev/vs14-generator.rst new file mode 100644 index 0000000000..0bda236a3b --- /dev/null +++ b/Help/release/dev/vs14-generator.rst @@ -0,0 +1,4 @@ +vs14-generator +-------------- + +* A :generator:`Visual Studio 14` generator was added. diff --git a/Help/variable/MSVC14.rst b/Help/variable/MSVC14.rst new file mode 100644 index 0000000000..33c782b746 --- /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 d74114ea51..ef3b0b5582 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 |