summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-04-03 17:18:01 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-04-08 09:05:55 (GMT)
commita579a0aab4e55aeb0a71dc7c1b58db3d126e1fd4 (patch)
treefb49ee1fc8606bfbc2d353c9ad20ff053df1c90f /Help
parentebab2015f9b9b11f09e19369be7a1c8d3bfe3ae4 (diff)
downloadCMake-a579a0aab4e55aeb0a71dc7c1b58db3d126e1fd4.zip
CMake-a579a0aab4e55aeb0a71dc7c1b58db3d126e1fd4.tar.gz
CMake-a579a0aab4e55aeb0a71dc7c1b58db3d126e1fd4.tar.bz2
Features: Add cxx_inheriting_constructors.
Diffstat (limited to 'Help')
-rw-r--r--Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
index 33e95b5..41820e0 100644
--- a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -52,6 +52,11 @@ The features known to this version of CMake are:
.. _N2928: http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm
+``cxx_inheriting_constructors``
+ Inheriting constructors, as defined in N2540_.
+
+ .. _N2540: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm
+
``cxx_override``
Override control ``override`` keyword, as defined in N2928_.