From f2820bce1560ab2ca0c991f16aa5cf5dcfb3d88f Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 17 Feb 2019 13:17:56 +1100 Subject: Release notes: Make ExternalProject dot points consistent Use same phrasing and command linking. --- Help/release/3.14.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/release/3.14.rst b/Help/release/3.14.rst index 13d209f..a04005c 100644 --- a/Help/release/3.14.rst +++ b/Help/release/3.14.rst @@ -172,7 +172,7 @@ Modules * The :module:`ExternalProject` module :command:`ExternalProject_Add` command gained ``LOG_PATCH`` to optionally log the patch step. -* The :module:`ExternalProject` module's ``ExternalProject_Add`` command +* The :module:`ExternalProject` module :command:`ExternalProject_Add` command learned to apply ``SOURCE_SUBDIR`` when ``BUILD_IN_SOURCE`` is also used. The ``BUILD_COMMAND`` is run in the given ``SOURCE_SUBDIR`` of the ``SOURCE_DIR``. -- cgit v0.12 From f2072a6554a8ec7969460509f3d05c07680c1f18 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 17 Feb 2019 13:30:07 +1100 Subject: 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. --- Modules/ExternalProject.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 `` - 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 `` This option only has an effect if at least one of the other ``LOG_`` -- cgit v0.12