From dfa58067e31e77e20f0cd25f408e248c8ff82cf4 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 4 Feb 2022 15:53:40 +0100
Subject: 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>
---
 cmake/Gn.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmake')

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}")
-- 
cgit v1.2.1