From 8fd262f1022990abb29b1523b612048fb13822b9 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 14 Jun 2013 16:42:39 +0200 Subject: 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. --- qtwebengine.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qtwebengine.pro') diff --git a/qtwebengine.pro b/qtwebengine.pro index 69bac5798..c08945a44 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -10,13 +10,16 @@ SUBDIRS = shared \ build \ # This is where we use the generated qt_generated.gypi and run gyp example \ +# Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway. +NINJA_EXECUTABLE = $$findNinja() + # Extra targets that invoke ninja on the desired configuration added for convenience release.target = release -release.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir()/Release +release.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Release release.depends: qmake debug.target = debug -debug.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir()/Debug +debug.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Debug debug.depends: qmake QMAKE_EXTRA_TARGETS += release \ -- cgit v1.2.3