diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-06-14 16:42:39 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-14 18:26:31 +0200 |
| commit | 8fd262f1022990abb29b1523b612048fb13822b9 (patch) | |
| tree | ec4fde9ff32f1586bde83aa5aa1ce169518ce4de /build/build.pro | |
| parent | 164650cd970a1884a758092b9a47c1639cbb96a2 (diff) | |
Make ninja detection a bit more robust
Having ninja in the PATH should be good enough.
If that didn't work, we try to find it in the most logical location
relative to CHROMIUM_SRC_DIR and bail out otherwise.
Since it seems unlikely to vary, and can be convenient to keep persistent,
we put it in .qmake.cache if qmake uses a cache.
Diffstat (limited to 'build/build.pro')
| -rw-r--r-- | build/build.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.pro b/build/build.pro index a2fa634e6..cd8384edd 100644 --- a/build/build.pro +++ b/build/build.pro @@ -9,7 +9,7 @@ GYP_OUTPUT = $$system(./gyp_qtwebengine) message($$GYP_OUTPUT) ninja.target = ninja -ninja.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir()/$$getConfigDir() +ninja.commands = $$findNinja() -C $$getOutDir()/$$getConfigDir() ninja.depends: qmake QMAKE_EXTRA_TARGETS += ninja |