Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit b7799f07 authored by Brad King's avatar Brad King

Merge branch 'doc-compile-features' into release-3.9

parents 61c1848c c4610df0
......@@ -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:
......
......@@ -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``.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment