diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-16 13:33:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-16 13:34:07 (GMT) |
| commit | 6c60ec0907669b0e91bf97515e93ac7b1208d6e1 (patch) | |
| tree | eb7065f330e6f86def4d636f5ba1496f5b38ff3c /Help/manual | |
| parent | 22894747b423c7a634addd7ca80b73eb70947d88 (diff) | |
| parent | c4610df03cf29f3f6765c897b47d0f5788cfc1fb (diff) | |
| download | CMake-6c60ec0907669b0e91bf97515e93ac7b1208d6e1.zip CMake-6c60ec0907669b0e91bf97515e93ac7b1208d6e1.tar.gz CMake-6c60ec0907669b0e91bf97515e93ac7b1208d6e1.tar.bz2 | |
Merge topic 'doc-compile-features'
c4610df0 Help: Document that VS 2017 compile features are recorded
69d50a7e Help: Fix typo in Cray/PGI/XL compile features docs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !971
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-compile-features.7.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index cfb1b78..0124395 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -334,7 +334,7 @@ versions specified for each: * ``AppleClang``: Apple Clang for Xcode versions 4.4 though 6.2. * ``Clang``: Clang compiler versions 2.9 through 3.4. * ``GNU``: GNU compiler versions 4.4 through 5.0. -* ``MSVC``: Microsoft Visual Studio versions 2010 through 2015. +* ``MSVC``: Microsoft Visual Studio versions 2010 through 2017. * ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.5. * ``Intel``: Intel compiler versions 12.1 through 17.0. @@ -347,7 +347,7 @@ versions specified for each: * ``GNU``: GNU compiler versions 3.4 through 5.0. CMake is currently aware of the :prop_tgt:`C++ standards <CXX_STANDARD>` and -thier associated meta-features (e.g. ``cxx_std_11``) available from the +their associated meta-features (e.g. ``cxx_std_11``) available from the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>` as of the versions specified for each: @@ -356,7 +356,7 @@ versions specified for each: * ``XL``: IBM XL version 10.1 through 13.1.5. CMake is currently aware of the :prop_tgt:`C standards <C_STANDARD>` and -thier associated meta-features (e.g. ``c_std_99``) available from the +their associated meta-features (e.g. ``c_std_99``) available from the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>` as of the versions specified for each: |