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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 6ee9be57d..d0a922f9c 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -368,24 +368,21 @@ defineTest(use?) { return(false) } -defineReplace(findOrBuildNinja) { - # If NINJA_PATH env var is set, prefer that. - # Fallback to locating our own bootstrapped ninja. - out = $(NINJA_PATH) - !exists($$out) { +defineReplace(buildNinja) { + src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir)) win32: out = $${out}.exe - # If we did not find ninja, then we bootstrap it. + # check if it is not already built !exists($$out) { - mkpath($$dirname(out)) - ninja_configure = $$absolute_path(ninja/configure.py, $$src_3rd_party_dir) - system("cd $$system_quote($$system_path($$dirname(out))) && python $$system_quote($$system_path($$ninja_configure)) --bootstrap") + mkpath($$dirname(out)) + ninja_configure = $$absolute_path(ninja/configure.py, $$src_3rd_party_dir) + system("cd $$system_quote($$system_path($$dirname(out))) && python $$system_quote($$system_path($$ninja_configure)) --bootstrap") } - } - return($$system_path($$out)) + + return($$out) } defineTest(skipBuild) { |