diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-15 14:14:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-15 14:14:29 (GMT) |
| commit | b7799f07d1bcf2708976b41aa07047c04e5ee3d0 (patch) | |
| tree | 9e2cf3acf499a461ee5b33f6a46837d7ac43bb7f | |
| parent | 61c1848cdc88cc5d36b23d14d0721ba832739a58 (diff) | |
| parent | c4610df03cf29f3f6765c897b47d0f5788cfc1fb (diff) | |
| download | CMake-b7799f07d1bcf2708976b41aa07047c04e5ee3d0.zip CMake-b7799f07d1bcf2708976b41aa07047c04e5ee3d0.tar.gz CMake-b7799f07d1bcf2708976b41aa07047c04e5ee3d0.tar.bz2 | |
Merge branch 'doc-compile-features' into release-3.9
| -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 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: 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``. |