[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2804-gca81ee3

Tue May 6 14:08:13 EDT 2014

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  ca81ee3e487c07dda491136aa15e5c7492f1d0ef (commit)
       via  04da9218b05eb73a2fe19f84f200887c702b7f65 (commit)
      from  626211978003eb3a218fdabda5defe4d62fcb308 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca81ee3e487c07dda491136aa15e5c7492f1d0ef
commit ca81ee3e487c07dda491136aa15e5c7492f1d0ef
Merge: 6262119 04da921
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 14:08:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 14:08:12 2014 -0400

    Merge topic 'decay-language-version' into next
    
    04da9218 cmTarget: Add CXX_STANDARD_REQUIRED to control decay.

diff --cc Help/manual/cmake-variables.7.rst
index 82242f5,33326c4..92c1f29
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@@ -258,7 -258,9 +258,8 @@@ Variables for Language
  
     /variable/CMAKE_COMPILER_IS_GNULANG
     /variable/CMAKE_CXX_COMPILE_FEATURES
 -   /variable/CMAKE_CXX_KNOWN_FEATURES
     /variable/CMAKE_CXX_STANDARD
+    /variable/CMAKE_CXX_STANDARD_REQUIRED
     /variable/CMAKE_CXX_EXTENSIONS
     /variable/CMAKE_Fortran_MODDIR_DEFAULT
     /variable/CMAKE_Fortran_MODDIR_FLAG

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04da9218b05eb73a2fe19f84f200887c702b7f65
commit 04da9218b05eb73a2fe19f84f200887c702b7f65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 30 18:07:38 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 20:07:50 2014 +0200

    cmTarget: Add CXX_STANDARD_REQUIRED to control decay.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index a82522d..3c720a0 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -108,6 +108,7 @@ Properties on Targets
    /prop_tgt/CONFIG_OUTPUT_NAME
    /prop_tgt/CONFIG_POSTFIX
    /prop_tgt/CXX_STANDARD
+   /prop_tgt/CXX_STANDARD_REQUIRED
    /prop_tgt/CXX_EXTENSIONS
    /prop_tgt/DEBUG_POSTFIX
    /prop_tgt/DEFINE_SYMBOL
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index dfdd09b..33326c4 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -260,6 +260,7 @@ Variables for Languages
    /variable/CMAKE_CXX_COMPILE_FEATURES
    /variable/CMAKE_CXX_KNOWN_FEATURES
    /variable/CMAKE_CXX_STANDARD
+   /variable/CMAKE_CXX_STANDARD_REQUIRED
    /variable/CMAKE_CXX_EXTENSIONS
    /variable/CMAKE_Fortran_MODDIR_DEFAULT
    /variable/CMAKE_Fortran_MODDIR_FLAG
diff --git a/Help/prop_tgt/CXX_STANDARD.rst b/Help/prop_tgt/CXX_STANDARD.rst
index fb72f3e..fdd5aac 100644
--- a/Help/prop_tgt/CXX_STANDARD.rst
+++ b/Help/prop_tgt/CXX_STANDARD.rst
@@ -19,7 +19,8 @@ means that using:
 
 with a compiler which does not support ``-std=c++11`` or an equivalent
 flag will not result in an error or warning, but will instead add the
-``-std=c++98`` flag if supported.
+``-std=c++98`` flag if supported.  This "decay" behavior may be controlled
+with the :prop_tgt:`CXX_STANDARD_REQUIRED` target property.
 
 This property is initialized by the value of
 the :variable:`CMAKE_CXX_STANDARD` variable if it is set when a target
diff --git a/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst b/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
new file mode 100644
index 0000000..f082805
--- /dev/null
+++ b/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
@@ -0,0 +1,14 @@
+CXX_STANDARD_REQUIRED
+---------------------
+
+Boolean describing whether the value of :prop_tgt:`CXX_STANDARD` is a requirement.
+
+If this property is set to ``ON``, then the value of the
+:prop_tgt:`CXX_STANDARD` target property is treated as a requirement.  If this
+property is ``OFF`` or unset, the :prop_tgt:`CXX_STANDARD` target property is
+treated as optional and may "decay" to a previous standard if the requested is
+not available.
+
+This property is initialized by the value of
+the :variable:`CMAKE_CXX_STANDARD_REQUIRED` variable if it is set when a
+target is created.
diff --git a/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst b/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
new file mode 100644
index 0000000..ff005da
--- /dev/null
+++ b/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
@@ -0,0 +1,8 @@
+CMAKE_CXX_STANDARD_REQUIRED
+---------------------------
+
+Default value for ``CXX_STANDARD_REQUIRED`` property of targets.
+
+This variable is used to initialize the :prop_tgt:`CXX_STANDARD_REQUIRED`
+property on all targets.  See that target property for additional
+information.

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

Summary of changes:
 Help/manual/cmake-properties.7.rst            |    1 +
 Help/manual/cmake-variables.7.rst             |    1 +
 Help/prop_tgt/CXX_STANDARD.rst                |    3 ++-
 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst       |   14 ++++++++++++++
 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst |    8 ++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
 create mode 100644 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst


hooks/post-receive
-- 
CMake
