summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-02-04 15:53:40 +0100
committerMichal Klocek <michal.klocek@qt.io>2022-02-05 11:59:17 +0000
commitdfa58067e31e77e20f0cd25f408e248c8ff82cf4 (patch)
tree72db4d66d015ab654ef1d250f128c974a149989e /cmake
parent747caebfca8b92880f960a953f98763adb40ffdf (diff)
downloadqtwebengine-dfa58067e31e77e20f0cd25f408e248c8ff82cf4.tar.gz
Add timeout for gn call
We get sometimes GN_FAILED on mac, unfortunately it is not clear what had failed, therefore log cmake error and add timeout. Pick-to: 6.3 6.2 Change-Id: I69beaa971de4a5848d73613783db94940be91e68 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Gn.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake
index adeae39fb..ce76d3e4f 100644
--- a/cmake/Gn.cmake
+++ b/cmake/Gn.cmake
@@ -61,10 +61,11 @@ execute_process(
RESULT_VARIABLE gnResult
OUTPUT_VARIABLE gnOutput
ERROR_VARIABLE gnError
+ TIMEOUT 300
)
if(NOT gnResult EQUAL 0)
- message(FATAL_ERROR "\n-- GN FAILED\n${gnOutput}\n${gnError}")
+ message(FATAL_ERROR "\n-- GN FAILED\n${gnOutput}\n${gnError}\n${gnResult}\n")
else()
string(REGEX REPLACE "\n$" "" gnOutput "${gnOutput}")
message("-- GN ${gnOutput}")