summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-04-20 12:08:10 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-04-20 12:24:51 +0200
commit890398a7a6fa88045bc1f852d828905f80459f9b (patch)
treea67b0af4dd216a3cb5e0a3a51cbd362ea75f0531 /cmake
parent8a636811fc2478c836988793766006b99b821ea4 (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. Pick-to: 6.2 6.3 Change-Id: Ibbfe5527cf291d9295ae19d988ee1fa83224b38b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Functions.cmake1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 77fef2114..ef605103f 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -1134,7 +1134,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