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/release | |
| 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/release')
| -rw-r--r-- | Help/release/3.9.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index 7222196..cd9476d 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``. |