diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-01 13:07:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-01 13:07:50 (GMT) |
| commit | 5a16e762e21e22e7a212acc7e2bc7bd027d66166 (patch) | |
| tree | 012f3d581b5c7fb6c149c8f2557255dc13372038 | |
| parent | f8ca0ab3ac858730874176bf332808061fe179c6 (diff) | |
| parent | efe22af20e0613308df935a05256d55fc420e42b (diff) | |
| download | CMake-5a16e762e21e22e7a212acc7e2bc7bd027d66166.zip CMake-5a16e762e21e22e7a212acc7e2bc7bd027d66166.tar.gz CMake-5a16e762e21e22e7a212acc7e2bc7bd027d66166.tar.bz2 | |
Merge topic 'msvc-doc-fix'
efe22af2 Help: Clarify MSVC and MSVC_VERSION variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1732
| -rw-r--r-- | Help/variable/MSVC.rst | 6 | ||||
| -rw-r--r-- | Help/variable/MSVC_VERSION.rst | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Help/variable/MSVC.rst b/Help/variable/MSVC.rst index 22a087a..ca8775c 100644 --- a/Help/variable/MSVC.rst +++ b/Help/variable/MSVC.rst @@ -1,8 +1,8 @@ MSVC ---- -``True`` when using Microsoft Visual C++. - -Set to ``true`` when the compiler is some version of Microsoft Visual C++. +Set to ``true`` when the compiler is some version of Microsoft Visual +C++ or another compiler simulating Visual C++. Any compiler defining +``_MSC_VER`` is considered simulating Visual C++. See also the :variable:`MSVC_VERSION` variable. diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst index 0a3a7a6..5f70c02 100644 --- a/Help/variable/MSVC_VERSION.rst +++ b/Help/variable/MSVC_VERSION.rst @@ -2,6 +2,9 @@ MSVC_VERSION ------------ The version of Microsoft Visual C/C++ being used if any. +If a compiler simulating Visual C++ is being used, this variable is set +to the toolset version simulated as given by the ``_MSC_VER`` +preprocessor definition. Known version numbers are:: |