diff options
author | Brad King <brad.king@kitware.com> | 2015-10-02 14:56:52 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-02 14:56:52 (GMT) |
commit | 7555babbcf4b2b68bdfe99649be3b6076230518b (patch) | |
tree | d906c055fa2635051c72a07a3a1dd910948c7521 /Help | |
parent | 9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (diff) | |
parent | 5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (diff) | |
download | CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.zip CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.tar.gz CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.tar.bz2 |
Merge topic 'compiler-features-solaris'
5fdf7594 Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
c824b23d Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux
61bc0f73 Features: Disable support for Oracle SolarisStudio on non-Linux
Diffstat (limited to 'Help')
-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 caf5bac..2dc67bc 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -308,4 +308,4 @@ 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 version 12.4 on a Linux host. |