[Cmake-commits] CMake branch, next, updated. v3.8.0-807-g21c5268
Kitware Robot
kwrobot at kitware.com
Tue Apr 18 14:55:02 EDT 2017
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 21c5268475125a50f3c5d9eb6c41813b179fdd53 (commit)
via eb08e1febba1cdc71bea2aee6431b5ed8f711af2 (commit)
via 8dd997526370c4d1232bcde46e0eb2a751dfa3fd (commit)
via a0091a697e275a86a493e4fd87902a0eb9067d55 (commit)
from 1ca3319d0d31fa45cfbdf7d28dc848b55aca849e (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=21c5268475125a50f3c5d9eb6c41813b179fdd53
commit 21c5268475125a50f3c5d9eb6c41813b179fdd53
Merge: 1ca3319 eb08e1f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 18:50:34 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 18 14:50:36 2017 -0400
Stage topic 'doc-CMAKE_MATCH_n'
Topic-id: 23748
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/719
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb08e1febba1cdc71bea2aee6431b5ed8f711af2
commit eb08e1febba1cdc71bea2aee6431b5ed8f711af2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:45:49 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 18 14:45:49 2017 -0400
Help: Document CMAKE_MATCH_<n> variables
diff --git a/Help/command/if.rst b/Help/command/if.rst
index f0a9588..edd343d 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -104,6 +104,7 @@ Possible expressions are:
``if(<variable|string> MATCHES regex)``
True if the given string or variable's value matches the given regular
expression. See :ref:`Regex Specification` for regex format.
+ ``()`` groups are captured in :variable:`CMAKE_MATCH_<n>` variables.
``if(<variable|string> LESS <variable|string>)``
True if the given string or variable's value is a valid number and less
diff --git a/Help/command/string.rst b/Help/command/string.rst
index fe38c99..4f0c45c 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -113,7 +113,7 @@ The following characters have special meaning in regular expressions:
in the ``REGEX REPLACE`` operation. Additionally it is saved
by all regular expression-related commands, including
e.g. :command:`if(MATCHES)`, in the variables
- ``CMAKE_MATCH_<n>`` for ``<n>`` 0..9.
+ :variable:`CMAKE_MATCH_<n>` for ``<n>`` 0..9.
``*``, ``+`` and ``?`` have higher precedence than concatenation. ``|``
has lower precedence than concatenation. This means that the regular
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 7347bcc..4317f67 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -56,6 +56,7 @@ Variables that Provide Information
/variable/CMAKE_MAJOR_VERSION
/variable/CMAKE_MAKE_PROGRAM
/variable/CMAKE_MATCH_COUNT
+ /variable/CMAKE_MATCH_n
/variable/CMAKE_MINIMUM_REQUIRED_VERSION
/variable/CMAKE_MINOR_VERSION
/variable/CMAKE_PARENT_LIST_FILE
diff --git a/Help/variable/CMAKE_MATCH_COUNT.rst b/Help/variable/CMAKE_MATCH_COUNT.rst
index 8b1c036..355e834 100644
--- a/Help/variable/CMAKE_MATCH_COUNT.rst
+++ b/Help/variable/CMAKE_MATCH_COUNT.rst
@@ -3,6 +3,7 @@ CMAKE_MATCH_COUNT
The number of matches with the last regular expression.
-When a regular expression match is used, CMake fills in ``CMAKE_MATCH_<n>``
-variables with the match contents. The ``CMAKE_MATCH_COUNT`` variable holds
-the number of match expressions when these are filled.
+When a regular expression match is used, CMake fills in
+:variable:`CMAKE_MATCH_<n>` variables with the match contents.
+The ``CMAKE_MATCH_COUNT`` variable holds the number of match
+expressions when these are filled.
diff --git a/Help/variable/CMAKE_MATCH_n.rst b/Help/variable/CMAKE_MATCH_n.rst
new file mode 100644
index 0000000..c7dd623
--- /dev/null
+++ b/Help/variable/CMAKE_MATCH_n.rst
@@ -0,0 +1,10 @@
+CMAKE_MATCH_<n>
+---------------
+
+Capture group ``<n>`` matched by the last regular expression, for groups
+0 through 9. Group 0 is the entire match. Groups 1 through 9 are the
+subexpressions captured by ``()`` syntax.
+
+When a regular expression match is used, CMake fills in ``CMAKE_MATCH_<n>``
+variables with the match contents. The :variable:`CMAKE_MATCH_COUNT`
+variable holds the number of match expressions when these are filled.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dd997526370c4d1232bcde46e0eb2a751dfa3fd
commit 8dd997526370c4d1232bcde46e0eb2a751dfa3fd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:45:04 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 18 14:45:04 2017 -0400
Help: Link from if(MATCHES) to regex specification docs
diff --git a/Help/command/if.rst b/Help/command/if.rst
index 2a087d0..f0a9588 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -103,7 +103,7 @@ Possible expressions are:
``if(<variable|string> MATCHES regex)``
True if the given string or variable's value matches the given regular
- expression.
+ expression. See :ref:`Regex Specification` for regex format.
``if(<variable|string> LESS <variable|string>)``
True if the given string or variable's value is a valid number and less
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 7199178..fe38c99 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -77,6 +77,8 @@ The replace expression may refer to paren-delimited subexpressions of the
match using ``\1``, ``\2``, ..., ``\9``. Note that two backslashes (``\\1``)
are required in CMake code to get a backslash through argument parsing.
+.. _`Regex Specification`:
+
Regex Specification
"""""""""""""""""""
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0091a697e275a86a493e4fd87902a0eb9067d55
commit a0091a697e275a86a493e4fd87902a0eb9067d55
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:42:09 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 18 14:44:50 2017 -0400
Help: Format string() command regex specification docs
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 698a91d..7199178 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -82,26 +82,36 @@ Regex Specification
The following characters have special meaning in regular expressions:
-::
-
- ^ Matches at beginning of input
- $ Matches at end of input
- . Matches any single character
- [ ] Matches any character(s) inside the brackets
- [^ ] Matches any character(s) not inside the brackets
- - Inside brackets, specifies an inclusive range between
- characters on either side e.g. [a-f] is [abcdef]
- To match a literal - using brackets, make it the first
- or the last character e.g. [+*/-] matches basic
- mathematical operators.
- * Matches preceding pattern zero or more times
- + Matches preceding pattern one or more times
- ? Matches preceding pattern zero or once only
- | Matches a pattern on either side of the |
- () Saves a matched subexpression, which can be referenced
- in the REGEX REPLACE operation. Additionally it is saved
- by all regular expression-related commands, including
- e.g. if( MATCHES ), in the variables CMAKE_MATCH_(0..9).
+``^``
+ Matches at beginning of input
+``$``
+ Matches at end of input
+``.``
+ Matches any single character
+``[ ]``
+ Matches any character(s) inside the brackets
+``[^ ]``
+ Matches any character(s) not inside the brackets
+``-``
+ Inside brackets, specifies an inclusive range between
+ characters on either side e.g. ``[a-f]`` is ``[abcdef]``
+ To match a literal ``-`` using brackets, make it the first
+ or the last character e.g. ``[+*/-]`` matches basic
+ mathematical operators.
+``*``
+ Matches preceding pattern zero or more times
+``+``
+ Matches preceding pattern one or more times
+``?``
+ Matches preceding pattern zero or once only
+``|``
+ Matches a pattern on either side of the ``|``
+``()``
+ Saves a matched subexpression, which can be referenced
+ in the ``REGEX REPLACE`` operation. Additionally it is saved
+ by all regular expression-related commands, including
+ e.g. :command:`if(MATCHES)`, in the variables
+ ``CMAKE_MATCH_<n>`` for ``<n>`` 0..9.
``*``, ``+`` and ``?`` have higher precedence than concatenation. ``|``
has lower precedence than concatenation. This means that the regular
-----------------------------------------------------------------------
Summary of changes:
Help/command/if.rst | 3 +-
Help/command/string.rst | 52 +++++++++++++++++++++--------------
Help/manual/cmake-variables.7.rst | 1 +
Help/variable/CMAKE_MATCH_COUNT.rst | 7 +++--
Help/variable/CMAKE_MATCH_n.rst | 10 +++++++
5 files changed, 49 insertions(+), 24 deletions(-)
create mode 100644 Help/variable/CMAKE_MATCH_n.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list