diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-18 14:08:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-18 14:09:02 (GMT) |
| commit | 786edf9ab408c35384a081d9f33ec048b4060f1f (patch) | |
| tree | 56f0131fa4456306c3778d3a44cc4c78f2840b88 /Modules | |
| parent | 03e10384ecb779ba6e02028d6833c5e8cd3541c5 (diff) | |
| parent | f2072a6554a8ec7969460509f3d05c07680c1f18 (diff) | |
| download | CMake-786edf9ab408c35384a081d9f33ec048b4060f1f.zip CMake-786edf9ab408c35384a081d9f33ec048b4060f1f.tar.gz CMake-786edf9ab408c35384a081d9f33ec048b4060f1f.tar.bz2 | |
Merge topic 'externalproject_docs'
f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior
f2820bce15 Release notes: Make ExternalProject dot points consistent
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2978
Diffstat (limited to 'Modules')
| -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>`` |