From f98de9e4d1631c17f4c3084baa1d1c8f2c69d906 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 7 Feb 2017 13:12:03 +0100 Subject: Fix running qmake recursively Move gn run call form make step to qmake step. Change-Id: I01913aef9dff505df3319755ae7009144919accf Reviewed-by: Allan Sandfeld Jensen --- src/core/gn_run.pro | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index ec91b469d..d33fe2394 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -5,6 +5,13 @@ isQtMinimum(5, 8) { TEMPLATE = aux +defineReplace(runGn) { + message("Running: $$1") + !system($$1) { + error("GN run error!") + } +} + qtConfig(debug_and_release): CONFIG += debug_and_release build_all build_pass|!debug_and_release { @@ -33,7 +40,7 @@ build_pass|!debug_and_release { gn_args = $$shell_quote($$gn_args) gn_src_root = $$shell_quote($$shell_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) gn_build_root = $$shell_quote($$shell_path($$OUT_PWD/$$getConfigDir())) - rungn.commands = $$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root + rungn.commands = $$runGn($$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root) QMAKE_EXTRA_TARGETS += rungn runninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -v -C $$shell_quote($$OUT_PWD/$$getConfigDir()) QtWebEngineCore -- cgit v1.2.3