Prechádzať zdrojové kódy

Merge topic 'doc_regex'

0d210b92fa Help: links to CMake regex syntax

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6179
Brad King 4 rokov pred
rodič
commit
e6bcd5e45a

+ 2 - 1
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.
  binary while reading unless this option is given.
 
 
 ``REGEX <regex>``
 ``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>``
 ``ENCODING <encoding-type>``
  .. versionadded:: 3.1
  .. versionadded:: 3.1

+ 2 - 1
Help/command/install.rst

@@ -573,7 +573,8 @@ any expression.  For example, the code
 
 
 will extract and install header files from a source tree.
 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
 only to files or directories matching them.  The ``EXCLUDE`` option will
 skip the matched file or directory.  The ``PERMISSIONS`` option overrides
 skip the matched file or directory.  The ``PERMISSIONS`` option overrides
 the permissions setting for the matched file or directory.  For
 the permissions setting for the matched file or directory.  For

+ 2 - 2
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.
 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.
 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:
 .. _INSERT:
 
 

+ 2 - 1
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
       An optional string specifying a regex for test names. Equivalent to
       passing ``--tests-regex`` on the command line. This field supports
       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``
     ``label``

+ 2 - 1
Help/manual/ctest.1.rst

@@ -158,7 +158,8 @@ Options
      See `Show as JSON Object Model`_.
      See `Show as JSON Object Model`_.
 
 
 ``-L <regex>, --label-regex <regex>``
 ``-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
  This option tells CTest to run only the tests whose labels match the
  given regular expression.  When more than one ``-L`` option is given,
  given regular expression.  When more than one ``-L`` option is given,