diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-18 14:08:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-18 14:08:05 (GMT) |
| commit | 1f8ed4141979ee4e2f2cc6aab8ad31a4942bd056 (patch) | |
| tree | 6e52fa5e1d58a842902d2cd67ca8b2497582a62d | |
| parent | 36323162cb1229148cdb8085f282d93f9c8ab244 (diff) | |
| parent | f2072a6554a8ec7969460509f3d05c07680c1f18 (diff) | |
| download | CMake-1f8ed4141979ee4e2f2cc6aab8ad31a4942bd056.zip CMake-1f8ed4141979ee4e2f2cc6aab8ad31a4942bd056.tar.gz CMake-1f8ed4141979ee4e2f2cc6aab8ad31a4942bd056.tar.bz2 | |
Merge branch 'externalproject_docs' into release-3.14
Merge-request: !2978
| -rw-r--r-- | Help/release/3.14.rst | 2 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
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``. 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>`` |