diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-20 12:08:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-21 07:34:46 +0000 |
| commit | cb84d9e51ef8a8b311db3f38d44fa6681d102ac0 (patch) | |
| tree | 5bda4f20818433699955f4211a60330baaaf7fdb | |
| parent | be46b3a76971e1c5ccee56b2026eb67785a7409d (diff) | |
CMake: Don't show gn output as it runs, show it after it finished
Using USES_TERMINAL causes ninja to print the stdout of running GN as
it comes in, rather than once GN has finished running.
This causes extremely confusing logs in the CI when the GN run fails.
The output becomes interleaved with execution of other parallel
commands and the Ninja 'FAILED:' message is nowhere near the actual
failure GN failure message.
Remove USES_TERMINAL so that the GN failure message appears
immediately after ninja's "FAILED:" message.
Recursive ninja output is not affected.
Change-Id: Ibbfe5527cf291d9295ae19d988ee1fa83224b38b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 890398a7a6fa88045bc1f852d828905f80459f9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Functions.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 12e5ea03a..5269d8a88 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1131,7 +1131,6 @@ function(add_gn_command) COMMENT "Run gn for target ${arg_CMAKE_TARGET} in ${arg_BUILDDIR}" DEPENDS ${gnArgArgFile} run_${arg_MODULE}_GnReady "${WEBENGINE_ROOT_SOURCE_DIR}/src/${arg_MODULE}/configure/BUILD.root.gn.in" - USES_TERMINAL ) add_custom_target(runGn_${arg_GN_TARGET} DEPENDS #TODO this is fixed in cmake 3.20 so we could simply use GN_TARGET and not create new one |