summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-10 17:46:22 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-10-10 17:46:34 (GMT)
commitf3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55 (patch)
treefb763636a6670e2bdaae5c0a11a07cd17af7d8d1
parent8af7a16be7290b84c233c5e7749600aa57c4a28a (diff)
parent1ed11f1c0dd43e493f0f80d17edc91e29f0422e0 (diff)
downloadCMake-f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55.zip
CMake-f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55.tar.gz
CMake-f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55.tar.bz2
Merge topic 'doc-lang-clarify'
1ed11f1c Help: Minor text clarifications in cmake-language(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1358
-rw-r--r--Help/manual/cmake-language.7.rst18
1 files changed, 10 insertions, 8 deletions
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 27b5d30..87f8f9d 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -183,18 +183,18 @@ same length:
.. productionlist::
bracket_argument: `bracket_open` `bracket_content` `bracket_close`
- bracket_open: '[' '='{len} '['
- bracket_content: <any text not containing a `bracket_close`
- : of the same {len} as the `bracket_open`>
- bracket_close: ']' '='{len} ']'
+ bracket_open: '[' '='* '['
+ bracket_content: <any text not containing a `bracket_close` with
+ : the same number of '=' as the `bracket_open`>
+ bracket_close: ']' '='* ']'
.. raw:: latex
\end{small}
-An opening bracket of length *len >= 0* is written ``[`` followed
-by *len* ``=`` followed by ``[`` and the corresponding closing
-bracket is written ``]`` followed by *len* ``=`` followed by ``]``.
+An opening bracket is written ``[`` followed by zero or more ``=`` followed
+by ``[``. The corresponding closing bracket is written ``]`` followed
+by the same number of ``=`` followed by ``]``.
Brackets do not nest. A unique length may always be chosen
for the opening and closing brackets to contain closing brackets
of other lengths.
@@ -334,6 +334,8 @@ For example:
beginning of an unquoted argument, and are treated as part of the
content. For example, the unquoted arguments ``-Da="b c"``,
``-Da=$(v)``, and ``a" "b"c"d`` are each interpreted literally.
+ They may instead be written as quoted arguments ``"-Da=\"b c\""``,
+ ``"-Da=$(v)"``, and ``"a\" \"b\"c\"d"``, respectively.
Make-style references are treated literally as part of the content
and do not undergo variable expansion. They are treated as part
@@ -514,7 +516,7 @@ Function Scope
create commands that, when invoked, process the recorded commands
in a new variable binding scope. A variable "set" or "unset"
binds in this scope and is visible for the current function and
- any nested calls, but not after the function returns.
+ any nested calls within it, but not after the function returns.
Directory Scope
Each of the `Directories`_ in a source tree has its own variable