summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-08 19:43:21 (GMT)
committerBrad King <brad.king@kitware.com>2015-01-08 19:43:21 (GMT)
commit13f0653375f94d42cb0cfa9ab8c78090b2f67eb0 (patch)
tree5bc1574e46b0a2e05ae34987ce031295f896c439 /Help
parenta2e4b09329dc518518165a21eae3021b50791bc0 (diff)
parent72a0d6df6dfa7c81a5a81c6f5b85b964815ffbc1 (diff)
downloadCMake-13f0653375f94d42cb0cfa9ab8c78090b2f67eb0.zip
CMake-13f0653375f94d42cb0cfa9ab8c78090b2f67eb0.tar.gz
CMake-13f0653375f94d42cb0cfa9ab8c78090b2f67eb0.tar.bz2
Merge branch 'doc-CXX_STANDARD-14' into release
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/CXX_STANDARD.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/prop_tgt/CXX_STANDARD.rst b/Help/prop_tgt/CXX_STANDARD.rst
index b50cdf9..6329e34 100644
--- a/Help/prop_tgt/CXX_STANDARD.rst
+++ b/Help/prop_tgt/CXX_STANDARD.rst
@@ -7,7 +7,7 @@ This property specifies the C++ standard whose features are requested
to build this target. For some compilers, this results in adding a
flag such as ``-std=gnu++11`` to the compile line.
-Supported values are ``98`` and ``11``.
+Supported values are ``98``, ``11`` and ``14``.
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