diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-06-27 16:38:18 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-06-27 17:25:17 +0200 |
| commit | 3b26bdea37cf1be0e3411ba6d8097e7a8fb600d1 (patch) | |
| tree | a556caf9f5d60f4ba8f950f43ff6804c8e5e4868 /build | |
| parent | b06b0876e6af6ed427ec06b1a9fd94c2f7809a11 (diff) | |
Tweak the build system
Fix a typo so we get the correct CHROMIUM_SRC_DIR and add it to
INCLUDEPATH so that QtCreator indexes Chromium headers.
Also add NINJAFLAGS environment variable to ninja command line
to be able to specify options to ninja, like how many jobs it
should run when using icecc.
Change-Id: Ib494dc5c71d4e3a4eac419118c9cf6b1c474b6da
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.pro | 2 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/default_pre.prf | 4 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/build/build.pro b/build/build.pro index 402cc919d..b6d08c4ba 100644 --- a/build/build.pro +++ b/build/build.pro @@ -9,7 +9,7 @@ GYP_OUTPUT = $$system(./gyp_qtwebengine) message($$GYP_OUTPUT) ninja.target = invoke_ninja -ninja.commands = $$findNinja() -C $$getOutDir()/$$getConfigDir() +ninja.commands = $$findNinja() $$(NINJAFLAGS) -C $$getOutDir()/$$getConfigDir() ninja.depends: qmake QMAKE_EXTRA_TARGETS += ninja diff --git a/build/qmake/mkspecs/features/default_pre.prf b/build/qmake/mkspecs/features/default_pre.prf index 279965523..ee1100ddb 100644 --- a/build/qmake/mkspecs/features/default_pre.prf +++ b/build/qmake/mkspecs/features/default_pre.prf @@ -5,6 +5,8 @@ QTWEBENGINEPROCESS_NAME = QtWebEngineProcess # Fetched from environment for now CHROMIUM_SRC_DIR = $$(CHROMIUM_SRC_DIR) -isEmpty(CHROMIUM_SRC_DIR): CHROMIUM_SRC_DIR=$QTWEBENGINE_ROOT/chromium +isEmpty(CHROMIUM_SRC_DIR): CHROMIUM_SRC_DIR=$$QTWEBENGINE_ROOT/chromium + +INCLUDEPATH += $$CHROMIUM_SRC_DIR load(functions) diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf index 8a3445170..979c3c302 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/build/qmake/mkspecs/features/functions.prf @@ -46,7 +46,6 @@ defineReplace(findNinja) { !isEmpty(CACHED_NINJA_EXECUTABLE):exists($$CACHED_NINJA_EXECUTABLE): return($$CACHED_NINJA_EXECUTABLE) out = $$system("which ninja 2>/dev/null") # Try to be smart about it if we know where the chromium sources are located - isEmpty(CHROMIUM_SRC_DIR): message(foobar) !exists($$out): out = $$absolute_path("$$QTWEBENGINE_ROOT/build/ninja/ninja") cache(CACHED_NINJA_EXECUTABLE, set, out) return($$out) |