diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-01 13:14:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-01 13:14:15 (GMT) |
| commit | 9ceef25ee2ebf6315e4c13dfc7102850c2807228 (patch) | |
| tree | ab32bd2b469e887e943b4daf45a71c50e29643b3 /Help/manual | |
| parent | e27716bd420679e2958602f43a21be26eb94ffcb (diff) | |
| parent | 369d580937b49c1c5672ba3512c2a736581d545c (diff) | |
| download | CMake-9ceef25ee2ebf6315e4c13dfc7102850c2807228.zip CMake-9ceef25ee2ebf6315e4c13dfc7102850c2807228.tar.gz CMake-9ceef25ee2ebf6315e4c13dfc7102850c2807228.tar.bz2 | |
Merge topic 'intel-compile-features-windows'
369d5809 Features: Record features for Intel Compiler on Windows
a5a3642f Features: Port Intel CXX features to test macros where possible
d34ac22f Features: Unset Intel CXX feature temporaries
967dcf36 Intel: Remove incorrect C++98 standard compiler flag on Windows
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 7289e61..9862d4a 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -309,4 +309,4 @@ versions specified for each: * ``GNU``: GNU compiler versions 4.4 through 5.0. * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015. * ``SunPro``: Oracle SolarisStudio version 12.4. -* ``Intel``: Intel compiler versions 12.1 through 16.0 on UNIX platforms. +* ``Intel``: Intel compiler versions 12.1 through 17.0. |