summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-28 13:26:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-28 13:26:09 (GMT)
commit5b4f771fd7eb02f4bb5248194796d191347e492b (patch)
tree7d496e39d55949952b21b8dc44cde48a47971a25 /Help
parent954c06803d32ee35c9af94969a4386848e6b7b79 (diff)
parent21b1fa5cb9adccd8d5bbc411c4932cf46d2ed29f (diff)
downloadCMake-5b4f771fd7eb02f4bb5248194796d191347e492b.zip
CMake-5b4f771fd7eb02f4bb5248194796d191347e492b.tar.gz
CMake-5b4f771fd7eb02f4bb5248194796d191347e492b.tar.bz2
Merge topic 'intel-compiler-features'
21b1fa5c Help: Add notes for topic 'intel-compiler-features' 9addce99 Features: Record standard flags for Intel C/C++ on Windows 15a6c950 WCDH: Add Intel to list of supported compilers 36f32ede Features: Record standards and features for Intel C on UNIX d028b948 Features: Specify minimum version Intel C++ 12.1 be910f00 Features: Record standards and features for Intel C++ on UNIX 7f401ae4 Features: Detect C default dialect on MSVC-like compilers
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-compile-features.7.rst1
-rw-r--r--Help/release/dev/intel-compiler-features.rst6
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index caf5bac..7289e61 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -309,3 +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.
diff --git a/Help/release/dev/intel-compiler-features.rst b/Help/release/dev/intel-compiler-features.rst
new file mode 100644
index 0000000..f154dc9
--- /dev/null
+++ b/Help/release/dev/intel-compiler-features.rst
@@ -0,0 +1,6 @@
+intel-compiler-features
+-----------------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+ is now aware of features supported by Intel C++ compilers versions 12.1
+ through 16.0 on UNIX platforms.