diff options
author | Craig Scott <craig.scott@crascit.com> | 2019-02-17 02:30:07 (GMT) |
---|---|---|
committer | Craig Scott <craig.scott@crascit.com> | 2019-02-17 02:30:07 (GMT) |
commit | f2072a6554a8ec7969460509f3d05c07680c1f18 (patch) | |
tree | b90dc91a7b9776eaa7f414f7577504bdff2afe3e /Modules/ExternalProject.cmake | |
parent | f2820bce1560ab2ca0c991f16aa5cf5dcfb3d88f (diff) | |
download | CMake-f2072a6554a8ec7969460509f3d05c07680c1f18.zip CMake-f2072a6554a8ec7969460509f3d05c07680c1f18.tar.gz CMake-f2072a6554a8ec7969460509f3d05c07680c1f18.tar.bz2 |
Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior
The output is only merged for a step if it is logging to file. This
option is ignored for steps that are logging normally.
A minor grammatical error has also been fixed as part of this change.
Diffstat (limited to 'Modules/ExternalProject.cmake')
-rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index c5d6b45..e097894 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -550,7 +550,8 @@ External Project Definition When enabled, the output of the test step is logged to files. ``LOG_MERGED_STDOUTERR <bool>`` - When enabled, the output the step is not split by stdout and stderr. + When enabled, stdout and stderr will be merged for any step whose + output is being logged to files. ``LOG_OUTPUT_ON_FAILURE <bool>`` This option only has an effect if at least one of the other ``LOG_<step>`` |