diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-03 12:09:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-03 12:09:34 (GMT) |
| commit | e6bcd5e45a3ff81815ef8bfba86388da1d0b0255 (patch) | |
| tree | 39aecf31f41c68f3a61d1d1c2169c62dab874177 | |
| parent | 4297357087aa64153128f6bcadbbe368266e59ad (diff) | |
| parent | 0d210b92faf8b2c6aa3e433781c10b1397c80e62 (diff) | |
| download | CMake-e6bcd5e45a3ff81815ef8bfba86388da1d0b0255.zip CMake-e6bcd5e45a3ff81815ef8bfba86388da1d0b0255.tar.gz CMake-e6bcd5e45a3ff81815ef8bfba86388da1d0b0255.tar.bz2 | |
Merge topic 'doc_regex'
0d210b92fa Help: links to CMake regex syntax
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6179
| -rw-r--r-- | Help/command/file.rst | 3 | ||||
| -rw-r--r-- | Help/command/install.rst | 3 | ||||
| -rw-r--r-- | Help/command/list.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 3 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst index 761fcbc..b6ed416 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -116,7 +116,8 @@ Parse a list of ASCII strings from ``<filename>`` and store it in binary while reading unless this option is given. ``REGEX <regex>`` - Consider only strings that match the given regular expression. + Consider only strings that match the given regular expression, + as described under :ref:`string(REGEX) <Regex Specification>`. ``ENCODING <encoding-type>`` .. versionadded:: 3.1 diff --git a/Help/command/install.rst b/Help/command/install.rst index 2865e1d..4d41fb3 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -573,7 +573,8 @@ any expression. For example, the code will extract and install header files from a source tree. -Some options may follow a ``PATTERN`` or ``REGEX`` expression and are applied +Some options may follow a ``PATTERN`` or ``REGEX`` expression as described +under :ref:`string(REGEX) <Regex Specification>` and are applied only to files or directories matching them. The ``EXCLUDE`` option will skip the matched file or directory. The ``PERMISSIONS`` option overrides the permissions setting for the matched file or directory. For diff --git a/Help/command/list.rst b/Help/command/list.rst index 7accc5a..f46641f 100644 --- a/Help/command/list.rst +++ b/Help/command/list.rst @@ -141,8 +141,8 @@ Appends elements to the list. Includes or removes items from the list that match the mode's pattern. In ``REGEX`` mode, items will be matched against the given regular expression. -For more information on regular expressions see also the -:command:`string` command. +For more information on regular expressions look under +:ref:`string(REGEX) <Regex Specification>`. .. _INSERT: diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 57c8ccf..0bcd691 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -642,7 +642,8 @@ that may contain the following fields: An optional string specifying a regex for test names. Equivalent to passing ``--tests-regex`` on the command line. This field supports - macro expansion. + macro expansion. CMake regex syntax is described under + :ref:`string(REGEX) <Regex Specification>`. ``label`` diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 811997c..72ef259 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -158,7 +158,8 @@ Options See `Show as JSON Object Model`_. ``-L <regex>, --label-regex <regex>`` - Run tests with labels matching regular expression. + Run tests with labels matching regular expression as described under + :ref:`string(REGEX) <Regex Specification>`. This option tells CTest to run only the tests whose labels match the given regular expression. When more than one ``-L`` option is given, |