diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-10-21 16:41:08 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-11-30 10:41:50 +0000 |
| commit | 15a38cb07539dce2b6f7e9008d79e2b7335d3289 (patch) | |
| tree | 8900444e4aff22619864a6ab07eed81ae995dfdd /src/core/gyp_run.pro | |
| parent | f2f20462e146508868d488f9bc370c53e000d2d9 (diff) | |
Add support for system based ninja
Adds system-ninja feature, which is enabled if
ninja is found in system path.
Change-Id: Icc58bc252d67a27f80c139349be28f9fd239108a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 1850447e7..7351b2443 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -2,6 +2,11 @@ # 1) invoking gyp through the gyp_qtwebengine script, which in turn makes use of the generated gypi include files # 2) produce a Makefile that will run ninja, and take care of actually building everything. +isQtMinimum(5, 8) { + include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) + QT_FOR_CONFIG += webengine-private +} + TEMPLATE = aux cross_compile { @@ -148,8 +153,12 @@ for (config, GYP_CONFIG): GYP_ARGS += "-D $$config" } build_pass|!debug_and_release { + + ninja_binary = ninja ninja.target = invoke_ninja - ninja.commands = $$findOrBuildNinja() \$\(NINJAFLAGS\) -C "$$OUT_PWD/$$getConfigDir()" + + !qtConfig(system-ninja): ninja_binary = $$shell_quote($$shell_path($$buildNinja())) + ninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -C $$shell_quote($$OUT_PWD/$$getConfigDir()) QMAKE_EXTRA_TARGETS += ninja build_pass:build_all: default_target.target = all |