[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2713-gd42c7f0

[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  d42c7f0495d74cf5207e8729f083163c48ac6dbf (commit)
       via  861874a60546459f7212489878c384e64346c7ea (commit)
       via  304af5fb5b3d94b05293d78a058d609634c8ebe4 (commit)
      from  075cd3be70a36f41b4df677ba0cc4dd12f6f419c (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=d42c7f0495d74cf5207e8729f083163c48ac6dbf
commit d42c7f0495d74cf5207e8729f083163c48ac6dbf
Merge: 075cd3b 861874a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 2 09:44:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 09:44:34 2014 -0400

    Merge topic 'dev/faster-evis' into next
    
    861874a6 Help: Fix CMP0053 reference to cmake-developer.7 manual
    304af5fb Help: Revise variable reference syntax in cmake-language.7


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=861874a60546459f7212489878c384e64346c7ea
commit 861874a60546459f7212489878c384e64346c7ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 2 09:39:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 2 09:42:22 2014 -0400

    Help: Fix CMP0053 reference to cmake-developer.7 manual

diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst
index 9657368..b6c6da0 100644
--- a/Help/policy/CMP0053.rst
+++ b/Help/policy/CMP0053.rst
@@ -32,7 +32,8 @@ cleaned up to simplify the behavior.  Specifically:
   Previously, only ``()#" \#@^`` were valid characters to
   escape. Now any non-alphanumeric, non-semicolon, non-NUL
   character may be escaped following the ``escape_identity``
-  rule from :manual:`cmake-language`.
+  production in the :ref:`Escape Sequences` section of the
+  :manual:`cmake-language(7)` manual.
 
 The ``OLD`` behavior for this policy is to honor the legacy behavior for
 variable references and escape sequences.  The ``NEW`` behavior is to

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=304af5fb5b3d94b05293d78a058d609634c8ebe4
commit 304af5fb5b3d94b05293d78a058d609634c8ebe4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 2 09:36:04 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 2 09:42:22 2014 -0400

    Help: Revise variable reference syntax in cmake-language.7

diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 45f4bac..b83dcad 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -296,15 +296,18 @@ An *escape sequence* is a ``\`` followed by one character:
 
 .. productionlist::
  escape_sequence: `escape_identity` | `escape_encoded` | `escape_semicolon`
- escape_identity: '\' <match '[^a-zA-Z]'>
+ escape_identity: '\' <match '[^A-Za-z0-9;]'>
  escape_encoded: '\t' | '\r' | '\n'
  escape_semicolon: '\;'
 
 A ``\`` followed by a non-alphanumeric character simply encodes the literal
 character without interpreting it as syntax.  A ``\t``, ``\r``, or ``\n``
 encodes a tab, carriage return, or newline character, respectively. A ``\;``
-encodes itself but may be used in an `Unquoted Argument`_ to encode the ``;``
-without dividing the argument value on it.
+outside of any `Variable References`_  encodes itself but may be used in an
+`Unquoted Argument`_ to encode the ``;`` without dividing the argument
+value on it.  A ``\;`` inside `Variable References`_ encodes the literal
+``;`` character.  (See also policy :policy:`CMP0053` documentation for
+historical considerations.)
 
 .. _`Variable References`:
 
@@ -318,6 +321,11 @@ or by the empty string if the variable is not set.
 Variable references can nest and are evaluated from the
 inside out, e.g. ``${outer_${inner_variable}_variable}``.
 
+Literal variable references may consist of alphanumeric characters,
+the characters ``/_.+-``, and `Escape Sequences`_.  Nested references
+may be used to evaluate variables of any name.  (See also policy
+:policy:`CMP0053` documentation for historical considerations.)
+
 The `Variables`_ section documents the scope of variable names
 and how their values are set.
 
@@ -408,14 +416,9 @@ interpret the strings as values of other types.
 The :command:`set` and :command:`unset` commands explicitly
 set or unset a variable, but other commands have semantics
 that modify variables as well.
-Variable names are case-sensitive and may consist of alphanumeric characters
-plus the characters ``/_.+-``. If other characters are required (e.g., to
-support literal variables no longer accepted by :policy:`CMP0053`), the
-following may be used:
-
-.. code-block:: cmake
-
- set(name "old_variable_name@") # Use ${${name}}
+Variable names are case-sensitive and may consist of almost
+any text, but we recommend sticking to names consisting only
+of alphanumeric characters plus ``_`` and ``-``.
 
 Variables have dynamic scope.  Each variable "set" or "unset"
 creates a binding in the current scope:

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

Summary of changes:
 Help/manual/cmake-language.7.rst |   25 ++++++++++++++-----------
 Help/policy/CMP0053.rst          |    3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake