summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@viroteck.net>2014-08-20 23:50:48 +0200
committerRobin Burchell <robin.burchell@viroteck.net>2014-08-21 10:55:13 +0200
commitbbfc44662eef80e6700301da77c48eb516fdeda4 (patch)
treec48c884da3ad4390c6546cbff258d878ff4a837c /src/src.pro
parentfce861bd01d7698ff180dd62ed0e59f65f4b1556 (diff)
Parallelize the QtWayland build.
Remove CONFIG += ordered and specify explicit dependencies to allow the Compositor and Client modules to be built in parallel. Change-Id: Ifc7ccbdb6fe6623609ad050ede1cbc995499e524 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro
index 274cc01c4..6dc3f7244 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,11 +1,23 @@
TEMPLATE=subdirs
-CONFIG+=ordered
-SUBDIRS += qtwaylandscanner
+sub_qtwaylandscanner.subdir = qtwaylandscanner
+sub_qtwaylandscanner.target = sub-qtwaylandscanner
+SUBDIRS += sub_qtwaylandscanner
-#Don't build QtCompositor API unless explicitly enabled
+# Don't build QtCompositor API unless explicitly enabled
contains(CONFIG, wayland-compositor) {
- SUBDIRS += compositor
+ sub_compositor.subdir = compositor
+ sub_compositor.depends = sub-qtwaylandscanner
+ sub_compositor.target = sub-compositor
+ SUBDIRS += sub_compositor
}
-SUBDIRS += client plugins
+sub_client.subdir = client
+sub_client.depends = sub-qtwaylandscanner
+sub_client.target = sub-client
+SUBDIRS += sub_client
+
+sub_plugins.subdir = plugins
+sub_plugins.depends = sub-qtwaylandscanner sub-client
+sub_plugins.target = sub-plugins
+SUBDIRS += sub_plugins