summaryrefslogtreecommitdiffstats
path: root/Tests/ExternalProject
diff options
context:
space:
mode:
authorWouter Klouwen <wouter.klouwen@youview.com>2018-10-12 17:33:36 (GMT)
committerWouter Klouwen <wouter.klouwen@youview.com>2018-10-19 14:32:51 (GMT)
commit7ddc9e353b097a9f6b0910d7d4875bd9c68c64d8 (patch)
tree0598d805dea707dd90166abb58dac20605b58ee0 /Tests/ExternalProject
parentb6f6cac378f4107d64b32981ba311b311157ce04 (diff)
downloadCMake-7ddc9e353b097a9f6b0910d7d4875bd9c68c64d8.zip
CMake-7ddc9e353b097a9f6b0910d7d4875bd9c68c64d8.tar.gz
CMake-7ddc9e353b097a9f6b0910d7d4875bd9c68c64d8.tar.bz2
ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderr
In some circumstances the user of ExternalProject may not desire the split log files for stdout and stderr. In particular with a project has many errors it can be difficult to correlate the output error with the command that it resulted from. This commit adds the LOG_MERGED_STDOUTERR option that when enabled outputs into a unified <name>-<step>.log for each step. If disabled it will default to the previous behaviour of <name>-<step>-out.log and <name>-<step>-err.log.
Diffstat (limited to 'Tests/ExternalProject')
-rw-r--r--Tests/ExternalProject/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index fd60306..5adcbd9 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -640,6 +640,7 @@ ExternalProject_Add(${proj}
CONFIGURE_COMMAND "${configure_cmd}" COMMAND "${CMAKE_COMMAND}" -E echo "configure"
BUILD_COMMAND "${build_cmd}" COMMAND "${CMAKE_COMMAND}" -E echo "build"
INSTALL_COMMAND "${install_cmd}" COMMAND "${CMAKE_COMMAND}" -E echo "install"
+ LOG_MERGED_STDOUTERR 1
LOG_DIR ${CMAKE_CURRENT_BINARY_DIR}/different_log
LOG_DOWNLOAD 1
LOG_PATCH 1