diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-16 13:33:47 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-16 09:34:07 -0400 |
| commit | 6c60ec0907669b0e91bf97515e93ac7b1208d6e1 (patch) | |
| tree | eb7065f330e6f86def4d636f5ba1496f5b38ff3c /Help | |
| parent | 22894747b423c7a634addd7ca80b73eb70947d88 (diff) | |
| parent | c4610df03cf29f3f6765c897b47d0f5788cfc1fb (diff) | |
| download | cmake-6c60ec0907669b0e91bf97515e93ac7b1208d6e1.tar.gz | |
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')
| -rw-r--r-- | Help/manual/cmake-compile-features.7.rst | 6 | ||||
| -rw-r--r-- | Help/release/3.9.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index cfb1b78304..012439500b 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: diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index 7222196e75..cd9476d2de 100644 --- a/Help/release/3.9.rst +++ b/Help/release/3.9.rst @@ -18,7 +18,7 @@ Languages :ref:`Makefile Generators` and the :generator:`Ninja` generator. * CMake is now aware of the :prop_tgt:`C++ standards <CXX_STANDARD>` and - :prop_tgt:`C standards <C_STANDARD>` and thier associated meta-features for + :prop_tgt:`C standards <C_STANDARD>` and their associated meta-features for the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>`: ``Cray``, ``PGI``, and ``XL``. |