diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-02-04 15:53:40 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-05 15:47:28 +0000 |
| commit | ae00bbcaf071b675ec5bac8c744945517c273e83 (patch) | |
| tree | d4c1d999cac16c935438075b5d8d318cdacf7d35 | |
| parent | db73b722b2412c9a3732e53299078fcb07283014 (diff) | |
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.
Change-Id: I69beaa971de4a5848d73613783db94940be91e68
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit dfa58067e31e77e20f0cd25f408e248c8ff82cf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Gn.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake index e8dc956ee..b4adc1bd3 100644 --- a/cmake/Gn.cmake +++ b/cmake/Gn.cmake @@ -59,10 +59,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}") |