diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-10-25 15:34:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 19:23:48 +0200 |
| commit | 01d4d6964665957ba1440f763545f6fbde73c2e5 (patch) | |
| tree | cfd78a03a008b5a32eb5686a2f4f17c5f700eab0 /qtwebengine.pro | |
| parent | a91f45afc49c465e1650e2395ba1183e3495888f (diff) | |
Use explicit dependencies to specify build order
Explicit dependencies make proper parallel builds possible.
Change-Id: I71f7d7fbee1244490dfcb040bb4145ab74d5c416
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'qtwebengine.pro')
| -rw-r--r-- | qtwebengine.pro | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index e8a2c5754..3c7b2e980 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,21 +1,44 @@ -TEMPLATE = subdirs +load(qt_parts) -CONFIG += ordered +TEMPLATE = subdirs # The first three subdirs contain dummy .pro files that are used by qmake # to generate a corresponding .gyp file -SUBDIRS = build/qmake_extras \ # Phony pro file that extracts things like compiler and linker from qmake + +# Phony pro file that extracts things like compiler and linker from qmake +qmake_extras.subdir = build/qmake_extras + +# Phony pro files that generate gyp files. Will be built by ninja. +shared.depends = qmake_extras +lib.depends = qmake_extras +process.depends = qmake_extras + +# API libraries +quick_lib.subdir = lib/quick +quick_lib.target = sub-quick-lib +quick_lib.depends = build +widgets_lib.subdir = lib/widgets +widgets_lib.target = sub-widgets-lib +widgets_lib.depends = build + +sub_examples.depends = quick_lib +sub_tests.depends = quick_lib + +# This is where we use the generated gypi files and run gyp_qtwebengine +build.depends = resources shared lib process + +SUBDIRS += qmake_extras \ resources \ shared \ lib \ process \ - build \ # This is where we use the generated qt_generated.gypi and run gyp - # Now build the API libraries - lib/quick + build \ + quick_lib qtHaveModule(widgets) { - SUBDIRS += \ - lib/widgets \ + SUBDIRS += widgets_lib + sub_examples.depends += widgets_lib + sub_tests.depends += widgets_lib } # Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway. @@ -32,5 +55,3 @@ debug.depends: qmake QMAKE_EXTRA_TARGETS += release \ debug - -load(qt_parts) |