[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4904-g65418b9
Brad King
brad.king at kitware.com
Thu Nov 7 16:43:42 EST 2013
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, next has been updated
via 65418b9066597e3dde28c17781395c98932c1ad9 (commit)
via 3bb62664924ce2937d30f828d84775d13ef6cae5 (commit)
via ea6b656f0ced8d0cb401f9de515d5e7358130aa5 (commit)
from d7d1d22fb1d230864cba0b1507dcc6b1a3542fb6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65418b9066597e3dde28c17781395c98932c1ad9
commit 65418b9066597e3dde28c17781395c98932c1ad9
Merge: d7d1d22 3bb6266
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 16:43:38 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 7 16:43:38 2013 -0500
Merge topic 'doc-execute_process' into next
3bb6266 Help: Clarify execute_process COMMAND argument behavior
ea6b656 Help: Format execute_process command documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bb62664924ce2937d30f828d84775d13ef6cae5
commit 3bb62664924ce2937d30f828d84775d13ef6cae5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 16:40:15 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 7 16:42:39 2013 -0500
Help: Clarify execute_process COMMAND argument behavior
State in the execute_process how COMMAND arguments are passed to
the child. Add a note at the end about how the command differs
from add_custom_*().
Suggested-by: Alan W. Irwin
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index af69f3f..478b30e 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -26,6 +26,16 @@ A single standard error pipe is used for all processes.
Options:
+COMMAND
+ A child process command line.
+
+ CMake executes the child process using operating system APIs directly.
+ All arguments are passed VERBATIM to the child process.
+ No intermediate shell is used, so shell operators such as ``>``
+ are treated as normal arguments.
+ (Use the ``INPUT_*``, ``OUTPUT_*``, and ``ERROR_*`` options to
+ redirect stdin, stdout, and stderr.)
+
WORKING_DIRECTORY
The named directory will be set as the current working directory of
the child processes.
@@ -59,3 +69,7 @@ be shared with the corresponding pipes of the CMake process itself.
The :command:`execute_process` command is a newer more powerful version of
:command:`exec_program`, but the old command has been kept for compatibility.
+Both commands run while CMake is processing the project prior to build
+system generation. Use :command:`add_custom_target` and
+:command:`add_custom_command` to create custom commands that run at
+build time.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea6b656f0ced8d0cb401f9de515d5e7358130aa5
commit ea6b656f0ced8d0cb401f9de515d5e7358130aa5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 16:32:52 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 7 16:42:04 2013 -0500
Help: Format execute_process command documentation
Use a code-block for the signature. Format the options as a definition
list.
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index 3f0ccc2..af69f3f 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -3,7 +3,7 @@ execute_process
Execute one or more child processes.
-::
+.. code-block:: cmake
execute_process(COMMAND <cmd1> [args1...]]
[COMMAND <cmd2> [args2...] [...]]
@@ -21,28 +21,41 @@ Execute one or more child processes.
[ERROR_STRIP_TRAILING_WHITESPACE])
Runs the given sequence of one or more commands with the standard
-output of each process piped to the standard input of the next. A
-single standard error pipe is used for all processes. If
-WORKING_DIRECTORY is given the named directory will be set as the
-current working directory of the child processes. If TIMEOUT is given
-the child processes will be terminated if they do not finish in the
-specified number of seconds (fractions are allowed). If
-RESULT_VARIABLE is given the variable will be set to contain the
-result of running the processes. This will be an integer return code
-from the last child or a string describing an error condition. If
-OUTPUT_VARIABLE or ERROR_VARIABLE are given the variable named will be
-set with the contents of the standard output and standard error pipes
-respectively. If the same variable is named for both pipes their
-output will be merged in the order produced. If INPUT_FILE,
-OUTPUT_FILE, or ERROR_FILE is given the file named will be attached to
-the standard input of the first process, standard output of the last
-process, or standard error of all processes respectively. If
-OUTPUT_QUIET or ERROR_QUIET is given then the standard output or
-standard error results will be quietly ignored. If more than one
-OUTPUT_* or ERROR_* option is given for the same pipe the precedence
-is not specified. If no OUTPUT_* or ERROR_* options are given the
-output will be shared with the corresponding pipes of the CMake
-process itself.
-
-The execute_process command is a newer more powerful version of
-exec_program, but the old command has been kept for compatibility.
+output of each process piped to the standard input of the next.
+A single standard error pipe is used for all processes.
+
+Options:
+
+WORKING_DIRECTORY
+ The named directory will be set as the current working directory of
+ the child processes.
+
+TIMEOUT
+ The child processes will be terminated if they do not finish in the
+ specified number of seconds (fractions are allowed).
+
+RESULT_VARIABLE
+ The variable will be set to contain the result of running the processes.
+ This will be an integer return code from the last child or a string
+ describing an error condition.
+
+OUTPUT_VARIABLE, ERROR_VARIABLE
+ The variable named will be set with the contents of the standard output
+ and standard error pipes, respectively. If the same variable is named
+ for both pipes their output will be merged in the order produced.
+
+INPUT_FILE, OUTPUT_FILE, ERROR_FILE
+ The file named will be attached to the standard input of the first
+ process, standard output of the last process, or standard error of
+ all processes, respectively.
+
+OUTPUT_QUIET, ERROR_QUIET
+ The standard output or standard error results will be quietly ignored.
+
+If more than one ``OUTPUT_*`` or ``ERROR_*`` option is given for the
+same pipe the precedence is not specified.
+If no ``OUTPUT_*`` or ``ERROR_*`` options are given the output will
+be shared with the corresponding pipes of the CMake process itself.
+
+The :command:`execute_process` command is a newer more powerful version of
+:command:`exec_program`, but the old command has been kept for compatibility.
-----------------------------------------------------------------------
Summary of changes:
Help/command/execute_process.rst | 79 +++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list