diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-02 13:46:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-02 13:46:33 (GMT) |
| commit | 3e34049516f75d8545543bc68246e62ec31fabc5 (patch) | |
| tree | 50f4a7ed5e3af596cda7f9676bf499d47bfd50cc | |
| parent | aba66d27a1d4b5364274784fce27a3c52ee2140b (diff) | |
| parent | be3727bf92a416a68f5946d2915d745c0f96740f (diff) | |
| download | CMake-3e34049516f75d8545543bc68246e62ec31fabc5.zip CMake-3e34049516f75d8545543bc68246e62ec31fabc5.tar.gz CMake-3e34049516f75d8545543bc68246e62ec31fabc5.tar.bz2 | |
Merge topic 'doc-compile-features-fixup'
be3727bf Help: Fix language standard link text in cmake-compile-features(7)
| -rw-r--r-- | Help/manual/cmake-compile-features.7.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index d641856..4f48ad9 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -326,7 +326,7 @@ the feature-appropriate include directory Supported Compilers =================== -CMake is currently aware of the :prop_tgt:`language standards <CXX_STANDARD>` +CMake is currently aware of the :prop_tgt:`C++ standards <CXX_STANDARD>` and :prop_gbl:`compile features <CMAKE_CXX_KNOWN_FEATURES>` available from the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>` as of the versions specified for each: @@ -338,7 +338,7 @@ versions specified for each: * ``SunPro``: Oracle SolarisStudio version 12.4. * ``Intel``: Intel compiler versions 12.1 through 17.0. -CMake is currently aware of the :prop_tgt:`language standards <CUDA_STANDARD>` +CMake is currently aware of the :prop_tgt:`CUDA standards <CUDA_STANDARD>` from the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>` as of the versions specified for each: |