summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-12-05 15:56:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-12-05 15:56:32 (GMT)
commit41f11259317668d53c9712afbb6cbc1580c45681 (patch)
treeba8bd87267694f449f1e6d20d9467c8e6b86eef9 /Help
parentd59010e47fa953afb7f638fbab1a65195478d3fa (diff)
parent97c1e569245f655b5701c0b5b38bc1daa19f1750 (diff)
downloadCMake-41f11259317668d53c9712afbb6cbc1580c45681.zip
CMake-41f11259317668d53c9712afbb6cbc1580c45681.tar.gz
CMake-41f11259317668d53c9712afbb6cbc1580c45681.tar.bz2
Merge topic 'features-c++17'
97c1e569 Help: Add release note for C++ 17 support 85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+ 8084f7a6 Features: Activate C++ 17 support for Clang 3.5+ 24e29d41 Features: Activate C++ 17 support for GNU 5.1+ ae1a6815 Features: Add infrastructure for C++ 17 language standard 684e4d20 Features: Make feature recording conditions more consistent
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst3
-rw-r--r--Help/prop_tgt/CXX_STANDARD.rst2
-rw-r--r--Help/release/dev/features-c++17.rst6
3 files changed, 10 insertions, 1 deletions
diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
index 00a5104..2ad8157 100644
--- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -23,6 +23,9 @@ The features known to this version of CMake are:
``cxx_std_14``
Compiler mode is aware of C++ 14.
+``cxx_std_17``
+ Compiler mode is aware of C++ 17.
+
``cxx_aggregate_default_initializers``
Aggregate default initializers, as defined in N3605_.
diff --git a/Help/prop_tgt/CXX_STANDARD.rst b/Help/prop_tgt/CXX_STANDARD.rst
index 5b186c1..30a612d 100644
--- a/Help/prop_tgt/CXX_STANDARD.rst
+++ b/Help/prop_tgt/CXX_STANDARD.rst
@@ -8,7 +8,7 @@ to build this target. For some compilers, this results in adding a
flag such as ``-std=gnu++11`` to the compile line. For compilers that
have no notion of a standard level, such as MSVC, this has no effect.
-Supported values are ``98``, ``11`` and ``14``.
+Supported values are ``98``, ``11``, ``14``, and ``17``.
If the value requested does not result in a compile flag being added for
the compiler in use, a previous standard flag will be added instead. This
diff --git a/Help/release/dev/features-c++17.rst b/Help/release/dev/features-c++17.rst
new file mode 100644
index 0000000..9c28ddf
--- /dev/null
+++ b/Help/release/dev/features-c++17.rst
@@ -0,0 +1,6 @@
+features-c++17
+--------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+ is now aware of C++ 17. No specific features are yet enumerated besides
+ the ``cxx_std_17`` meta-feature.