diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-21 12:53:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-21 12:53:22 (GMT) |
| commit | cb794ac78871f203cd0a4392c449ecd565b32974 (patch) | |
| tree | 371652ae48e692c55174cd2acb798446165ba648 /Help/manual | |
| parent | 9fae23f7032dda42312fc9e6d30c7dca028e83df (diff) | |
| parent | 4267960fc9751b1c7557cf1ef5234b328be7c839 (diff) | |
| download | CMake-cb794ac78871f203cd0a4392c449ecd565b32974.zip CMake-cb794ac78871f203cd0a4392c449ecd565b32974.tar.gz CMake-cb794ac78871f203cd0a4392c449ecd565b32974.tar.bz2 | |
Merge topic 'sunpro-5.15'
4267960fc9 Features: Record for SunPro 5.15
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1875
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-compile-features.7.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 0124395..e9495c6 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -335,7 +335,7 @@ versions specified for each: * ``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 2017. -* ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.5. +* ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.6. * ``Intel``: Intel compiler versions 12.1 through 17.0. CMake is currently aware of the :prop_tgt:`C standards <C_STANDARD>` |