diff options
author | Brad King <brad.king@kitware.com> | 2018-10-29 13:25:30 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-29 13:30:25 (GMT) |
commit | f0a9094d809a80ef754642b13d7b66a90b61cee7 (patch) | |
tree | a927d56fa8f4f569c8001683ff62dc7097760f48 /Help/command | |
parent | 4eb77958d208c338c9bfcc32857531eaed78ee73 (diff) | |
parent | 24fa04018cbfcbbd9c52418be2ead8802eb361c4 (diff) | |
download | CMake-f0a9094d809a80ef754642b13d7b66a90b61cee7.zip CMake-f0a9094d809a80ef754642b13d7b66a90b61cee7.tar.gz CMake-f0a9094d809a80ef754642b13d7b66a90b61cee7.tar.bz2 |
Merge topic 'no-smiley'
24fa04018c Help: Spell out ";-list" as "semicolon-separated list"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2528
Diffstat (limited to 'Help/command')
-rw-r--r-- | Help/command/FIND_XXX.txt | 2 | ||||
-rw-r--r-- | Help/command/execute_process.rst | 2 | ||||
-rw-r--r-- | Help/command/find_package.rst | 2 | ||||
-rw-r--r-- | Help/command/set.rst | 2 | ||||
-rw-r--r-- | Help/command/target_link_libraries.rst | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index 73dbd57..dde4dbb 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -96,7 +96,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: 2. Search paths specified in cmake-specific cache variables. These are intended to be used on the command line with a ``-DVAR=value``. - The values are interpreted as :ref:`;-lists <CMake Language Lists>`. + The values are interpreted as :ref:`semicolon-separated lists <CMake Language Lists>`. This can be skipped if ``NO_CMAKE_PATH`` is passed. * |CMAKE_PREFIX_PATH_XXX| diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst index fc7d177..3a56dce 100644 --- a/Help/command/execute_process.rst +++ b/Help/command/execute_process.rst @@ -56,7 +56,7 @@ Options: ``RESULTS_VARIABLE <variable>`` The variable will be set to contain the result of all processes as a - :ref:`;-list <CMake Language Lists>`, in order of the given ``COMMAND`` + :ref:`semicolon-separated list <CMake Language Lists>`, in order of the given ``COMMAND`` arguments. Each entry will be an integer return code from the corresponding child or a string describing an error condition. diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 9395356..937a930 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -291,7 +291,7 @@ enabled. 2. Search paths specified in cmake-specific cache variables. These are intended to be used on the command line with a ``-DVAR=value``. - The values are interpreted as :ref:`;-lists <CMake Language Lists>`. + The values are interpreted as :ref:`semicolon-separated lists <CMake Language Lists>`. This can be skipped if ``NO_CMAKE_PATH`` is passed:: CMAKE_PREFIX_PATH diff --git a/Help/command/set.rst b/Help/command/set.rst index d57b177..e37e693 100644 --- a/Help/command/set.rst +++ b/Help/command/set.rst @@ -8,7 +8,7 @@ and cache entries. Signatures of this command that specify a ``<value>...`` placeholder expect zero or more arguments. Multiple arguments will be joined as -a :ref:`;-list <CMake Language Lists>` to form the actual variable +a :ref:`semicolon-separated list <CMake Language Lists>` to form the actual variable value to be set. Zero arguments will cause normal variables to be unset. See the :command:`unset` command to unset variables explicitly. diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index 76c0d28..c5e4f9f 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -94,7 +94,7 @@ Each ``<item>`` may be: * **A generator expression**: A ``$<...>`` :manual:`generator expression <cmake-generator-expressions(7)>` may evaluate to any of the above - items or to a :ref:`;-list <CMake Language Lists>` of them. + items or to a :ref:`semicolon-separated list <CMake Language Lists>` of them. If the ``...`` contains any ``;`` characters, e.g. after evaluation of a ``${list}`` variable, be sure to use an explicitly quoted argument ``"$<...>"`` so that this command receives it as a |