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, master has been updated
via 01c0d863f4e7a0ff0e95bec51aeaf6d95c763fcc (commit)
via d5b722bbbd684477e8b8a979ba62a2f1b45a720c (commit)
via ddc7ea46961da54fe00d13f20e6192540f801949 (commit)
via c509f38b7b8c80e0174be75b6f8d5e99343213b7 (commit)
via 9cc6befe1b7de68910787c5732e436393de2bdfc (commit)
via 074fbdb73f052212003ef65804c3532380c76dcd (commit)
from f889e0320cf27b364c718db50c9462ca7211b73e (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=01c0d863f4e7a0ff0e95bec51aeaf6d95c763fcc
commit 01c0d863f4e7a0ff0e95bec51aeaf6d95c763fcc
Merge: f889e03 d5b722b
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Thu Jul 4 12:25:08 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 4 08:25:25 2019 -0400
Merge topic 'docs-misc-trivial-cleanups'
d5b722bbbd Help: Remove mention of CMAKE_INSTALL_DO_STRIP
ddc7ea4696 Help: Clarify how to provide multiple targets with cmake --target
c509f38b7b Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO
9cc6befe1b Help: Improve formatting of list(TRANSFORM) sub-options
074fbdb73f Help: Clean up trivial typos and grammar
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Brad King <brad.k...@kitware.com>
Merge-request: !3498
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b722bbbd684477e8b8a979ba62a2f1b45a720c
commit d5b722bbbd684477e8b8a979ba62a2f1b45a720c
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Wed Jul 3 23:37:54 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Wed Jul 3 23:38:25 2019 +1000
Help: Remove mention of CMAKE_INSTALL_DO_STRIP
It isn't yet clear whether we want to make this part of the
documented API for the install script. Remove it from the
docs before it appears in an official release for now.
Relates: #18997
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index e91f060..ff099dd 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -343,7 +343,7 @@ The options are:
Override the installation prefix, :variable:`CMAKE_INSTALL_PREFIX`.
``--strip``
- Strip before installing by setting ``CMAKE_INSTALL_DO_STRIP``.
+ Strip before installing.
``-v, --verbose``
Enable verbose output.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddc7ea46961da54fe00d13f20e6192540f801949
commit ddc7ea46961da54fe00d13f20e6192540f801949
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Jul 2 23:14:31 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Wed Jul 3 23:38:25 2019 +1000
Help: Clarify how to provide multiple targets with cmake --target
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index dccf797..e91f060 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -290,7 +290,8 @@ following options:
value of ``1`` can be used to limit to a single job.
``--target <tgt>..., -t <tgt>...``
- Build ``<tgt>`` instead of default targets. May be specified multiple times.
+ Build ``<tgt>`` instead of the default target. Multiple targets may be
+ given, separated by spaces.
``--config <cfg>``
For multi-configuration tools, choose configuration ``<cfg>``.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c509f38b7b8c80e0174be75b6f8d5e99343213b7
commit c509f38b7b8c80e0174be75b6f8d5e99343213b7
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sun Jun 30 21:15:35 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Wed Jul 3 23:38:25 2019 +1000
Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index b11d1ac..14f879d 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -81,6 +81,8 @@ Options:
``COMMAND_ECHO <where>``
The command being run will be echo'ed to ``<where>`` with ``<where>``
being set to one of ``STDERR``, ``STDOUT`` or ``NONE``.
+ See the :variable:`CMAKE_EXECUTE_PROCESS_COMMAND_ECHO` variable for a way
+ to control the default behavior when this option is not present.
``ENCODING <name>``
On Windows, the encoding that is used to decode output from the process.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cc6befe1b7de68910787c5732e436393de2bdfc
commit 9cc6befe1b7de68910787c5732e436393de2bdfc
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sun Jun 30 19:43:11 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Wed Jul 3 23:38:25 2019 +1000
Help: Improve formatting of list(TRANSFORM) sub-options
diff --git a/Help/command/list.rst b/Help/command/list.rst
index 866a597..39e7e2a 100644
--- a/Help/command/list.rst
+++ b/Help/command/list.rst
@@ -223,41 +223,41 @@ The actions have exactly the same semantics as
sub-commands of the
``APPEND``, ``PREPEND``: Append, prepend specified value to each element of
the list.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> <APPEND|PREPEND> <value> ...)
+ list(TRANSFORM <list> <APPEND|PREPEND> <value> ...)
``TOUPPER``, ``TOLOWER``: Convert each element of the list to upper, lower
characters.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> <TOLOWER|TOUPPER> ...)
+ list(TRANSFORM <list> <TOLOWER|TOUPPER> ...)
``STRIP``: Remove leading and trailing spaces from each element of the
list.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> STRIP ...)
+ list(TRANSFORM <list> STRIP ...)
``GENEX_STRIP``: Strip any
:manual:`generator expressions <cmake-generator-expressions(7)>` from each
element of the list.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> GENEX_STRIP ...)
+ list(TRANSFORM <list> GENEX_STRIP ...)
``REPLACE``: Match the regular expression as many times as possible and
substitute the replacement expression for the match for each element
of the list
(Same semantic as ``REGEX REPLACE`` from :command:`string` command).
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> REPLACE <regular_expression>
- <replace_expression> ...)
+ list(TRANSFORM <list> REPLACE <regular_expression>
+ <replace_expression> ...)
``<SELECTOR>`` determines which elements of the list will be transformed.
Only one type of selector can be specified at a time. When given,
@@ -265,23 +265,23 @@ Only one type of selector can be specified at a time.
When given,
``AT``: Specify a list of indexes.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> <ACTION> AT <index> [<index> ...] ...)
+ list(TRANSFORM <list> <ACTION> AT <index> [<index> ...] ...)
``FOR``: Specify a range with, optionally, an increment used to iterate over
the range.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> <ACTION> FOR <start> <stop> [<step>] ...)
+ list(TRANSFORM <list> <ACTION> FOR <start> <stop> [<step>] ...)
``REGEX``: Specify a regular expression. Only elements matching the regular
expression will be transformed.
-.. code-block:: cmake
+ .. code-block:: cmake
- list(TRANSFORM <list> <ACTION> REGEX <regular_expression> ...)
+ list(TRANSFORM <list> <ACTION> REGEX <regular_expression> ...)
Ordering
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=074fbdb73f052212003ef65804c3532380c76dcd
commit 074fbdb73f052212003ef65804c3532380c76dcd
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sat Jun 29 22:05:22 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Wed Jul 3 23:38:25 2019 +1000
Help: Clean up trivial typos and grammar
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index e6ad037..b11d1ac 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -80,7 +80,7 @@ Options:
``COMMAND_ECHO <where>``
The command being run will be echo'ed to ``<where>`` with ``<where>``
- being set to ``STDERR``|``STDOUT``|``NONE``.
+ being set to one of ``STDERR``, ``STDOUT`` or ``NONE``.
``ENCODING <name>``
On Windows, the encoding that is used to decode output from the process.
diff --git a/Help/command/list.rst b/Help/command/list.rst
index 4444af7..866a597 100644
--- a/Help/command/list.rst
+++ b/Help/command/list.rst
@@ -207,20 +207,18 @@ but if duplicates are encountered, only the first
instance is preserved.
[OUTPUT_VARIABLE <output variable>])
Transforms the list by applying an action to all or, by specifying a
-``<SELECTOR>``, to the selected elements of the list, storing result in-place
-or in the specified output variable.
+``<SELECTOR>``, to the selected elements of the list, storing the result
+in-place or in the specified output variable.
.. note::
- ``TRANSFORM`` sub-command does not change the number of elements of the
+ The ``TRANSFORM`` sub-command does not change the number of elements in the
list. If a ``<SELECTOR>`` is specified, only some elements will be changed,
- the other ones will remain same as before the transformation.
+ the other ones will remain the same as before the transformation.
-``<ACTION>`` specify the action to apply to the elements of list.
-The actions have exactly the same semantics as sub-commands of
-:command:`string` command.
-
-The ``<ACTION>`` may be one of:
+``<ACTION>`` specifies the action to apply to the elements of the list.
+The actions have exactly the same semantics as sub-commands of the
+:command:`string` command. ``<ACTION>`` must be one of the following:
``APPEND``, ``PREPEND``: Append, prepend specified value to each element of
the list.
@@ -261,10 +259,9 @@ of the list
list(TRANSFORM <list> REPLACE <regular_expression>
<replace_expression> ...)
-``<SELECTOR>`` select which elements of the list will be transformed. Only one
-type of selector can be specified at a time.
-
-The ``<SELECTOR>`` may be one of:
+``<SELECTOR>`` determines which elements of the list will be transformed.
+Only one type of selector can be specified at a time. When given,
+``<SELECTOR>`` must be one of the following:
``AT``: Specify a list of indexes.
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 13cba71..dccf797 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -333,13 +333,13 @@ The options are:
Project binary directory to install. This is required and must be first.
``--config <cfg>``
- For multi-configuration tools, choose configuration ``<cfg>``.
+ For multi-configuration generators, choose configuration ``<cfg>``.
``--component <comp>``
Component-based install. Only install component ``<comp>``.
``--prefix <prefix>``
- The installation prefix :variable:`CMAKE_INSTALL_PREFIX`.
+ Override the installation prefix, :variable:`CMAKE_INSTALL_PREFIX`.
``--strip``
Strip before installing by setting ``CMAKE_INSTALL_DO_STRIP``.
diff --git a/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
b/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
index 893a298..b6f6160 100644
--- a/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
+++ b/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
@@ -13,5 +13,5 @@ part of the ``make clean`` target.
Arguments to :prop_dir:`ADDITIONAL_MAKE_CLEAN_FILES` may use
:manual:`generator expressions <cmake-generator-expressions(7)>`.
-This property only works for the the Makefile generators.
+This property only works for the Makefile generators.
It is ignored on other generators.
diff --git a/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
b/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
index 4a3121c..76561d8 100644
--- a/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
+++ b/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
@@ -1,6 +1,6 @@
CMAKE_EXECUTE_PROCESS_COMMAND_ECHO
----------------------------------
-If this variable is set to ``STDERR``|``STDOUT``|``NONE`` then commands in
-:command:`execute_process` calls will be printed to either stderr or stdout
-or not at all.
+If this variable is set to ``STDERR``, ``STDOUT`` or ``NONE`` then commands
+in :command:`execute_process` calls will be printed to either stderr or
+stdout or not at all.
-----------------------------------------------------------------------
Summary of changes:
Help/command/execute_process.rst | 4 +-
Help/command/list.rst | 57 ++++++++++------------
Help/manual/cmake.1.rst | 9 ++--
Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst | 2 +-
.../CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst | 6 +--
5 files changed, 39 insertions(+), 39 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
