[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-578-g9d1b5b1

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9d1b5b13d3ae39e617b8b14cee52d8f251ea6669 (commit)
       via  e8f75bf026daa0fa0a9781ae1140004ea79b2519 (commit)
      from  e7df754963dadf6c40f946f0ed5bd52809e7df2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d1b5b13d3ae39e617b8b14cee52d8f251ea6669
commit 9d1b5b13d3ae39e617b8b14cee52d8f251ea6669
Merge: e7df754 e8f75bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 28 09:13:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 28 09:13:29 2016 -0400

    Merge topic '16162-cross-reference-doc' into next
    
    e8f75bf0 fixup! Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8f75bf026daa0fa0a9781ae1140004ea79b2519
commit e8f75bf026daa0fa0a9781ae1140004ea79b2519
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 28 09:10:43 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 28 09:10:43 2016 -0400

    fixup! Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)

diff --git a/Help/prop_tgt/CXX_STANDARD.rst b/Help/prop_tgt/CXX_STANDARD.rst
index 37c3e5a..5b186c1 100644
--- a/Help/prop_tgt/CXX_STANDARD.rst
+++ b/Help/prop_tgt/CXX_STANDARD.rst
@@ -21,9 +21,9 @@ means that using:
 with a compiler which does not support ``-std=gnu++11`` or an equivalent
 flag will not result in an error or warning, but will instead add the
 ``-std=gnu++98`` flag if supported.  This "decay" behavior may be controlled
-with the :prop_tgt:`CXX_STANDARD_REQUIRED` target property. Eventually available
-compiler extensions for the requested standard could be controlled with the
-:prop_tgt:`CXX_EXTENSIONS` target property.
+with the :prop_tgt:`CXX_STANDARD_REQUIRED` target property.
+Additionally, the :prop_tgt:`CXX_EXTENSIONS` target property may be used to
+control whether compiler-specific extensions are enabled on a per-target basis.
 
 See the :manual:`cmake-compile-features(7)` manual for information on
 compile features and a list of supported compilers.
diff --git a/Help/prop_tgt/C_STANDARD.rst b/Help/prop_tgt/C_STANDARD.rst
index 52c4a34..815a686 100644
--- a/Help/prop_tgt/C_STANDARD.rst
+++ b/Help/prop_tgt/C_STANDARD.rst
@@ -22,8 +22,8 @@ with a compiler which does not support ``-std=gnu11`` or an equivalent
 flag will not result in an error or warning, but will instead add the
 ``-std=gnu99`` or ``-std=gnu90`` flag if supported.  This "decay" behavior may
 be controlled with the :prop_tgt:`C_STANDARD_REQUIRED` target property.
-Eventually available compiler extensions for the requested standard could be
-controlled with the :prop_tgt:`C_EXTENSIONS` target property.
+Additionally, the :prop_tgt:`C_EXTENSIONS` target property may be used to
+control whether compiler-specific extensions are enabled on a per-target basis.
 
 See the :manual:`cmake-compile-features(7)` manual for information on
 compile features and a list of supported compilers.

-----------------------------------------------------------------------

Summary of changes:
 Help/prop_tgt/CXX_STANDARD.rst |    6 +++---
 Help/prop_tgt/C_STANDARD.rst   |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake