diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-04 15:33:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-04 15:33:38 (GMT) |
| commit | 30cb24f39cb5bd4dc053662d4cf1b124813e63d8 (patch) | |
| tree | 912c43802dbf9ba044a54aa34959048d197ce1c0 /Help/manual/cmake-compile-features.7.rst | |
| parent | a83250880ad511d92d96bfd860873b9c79c0f462 (diff) | |
| parent | f15f905babad5977aa422e1753fe1aa658c77fa2 (diff) | |
| download | CMake-30cb24f39cb5bd4dc053662d4cf1b124813e63d8.zip CMake-30cb24f39cb5bd4dc053662d4cf1b124813e63d8.tar.gz CMake-30cb24f39cb5bd4dc053662d4cf1b124813e63d8.tar.bz2 | |
Merge topic 'sunpro-5.14'
f15f905b Features: Record standards and features for SunPro 5.14
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !795
Diffstat (limited to 'Help/manual/cmake-compile-features.7.rst')
| -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 448fe9a..fa2aa8d 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 2015. -* ``SunPro``: Oracle SolarisStudio version 12.4. +* ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.5. * ``Intel``: Intel compiler versions 12.1 through 17.0. CMake is currently aware of the :prop_tgt:`C standards <C_STANDARD>` |