diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-03 15:14:47 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-23 06:50:34 +0000 |
| commit | 1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 (patch) | |
| tree | 12206741f269aef8d45a8f8165919347dd359d0d /src/src.pro | |
| parent | c445cf7d4e517248013e707a5050f9e0408a2746 (diff) | |
| download | qtwayland-1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37.tar.gz | |
Move qtwayland over to use the new configuration system
Re-use configuration results from qtbase where possible and move
all pkg-config handling over to be done at configuration time.
Since waylandclient and waylandcompositor are two independent libs,
this required some duplication of features and libraries used by
both in the configure.json files.
Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/src.pro b/src/src.pro index bf5ffe36..4ecbc71b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,25 +1,33 @@ TEMPLATE=subdirs +include($$OUT_PWD/client/qtwaylandclient-config.pri) +include($$OUT_PWD/compositor/qtwaylandcompositor-config.pri) +QT_FOR_CONFIG += waylandclient-private waylandcompositor-private -sub_qtwaylandscanner.subdir = qtwaylandscanner -sub_qtwaylandscanner.target = sub-qtwaylandscanner -SUBDIRS += sub_qtwaylandscanner +qtConfig(wayland-client) { + sub_qtwaylandscanner.subdir = qtwaylandscanner + sub_qtwaylandscanner.target = sub-qtwaylandscanner + SUBDIRS += sub_qtwaylandscanner -sub_compositor.subdir = compositor -sub_compositor.depends = sub-qtwaylandscanner -sub_compositor.target = sub-compositor -SUBDIRS += sub_compositor + sub_client.subdir = client + sub_client.depends = sub-qtwaylandscanner + sub_client.target = sub-client + SUBDIRS += sub_client -sub_imports.subdir = imports -sub_imports.depends += sub-compositor -sub_imports.target = sub-imports -SUBDIRS += sub_imports + qtConfig(wayland-server) { + sub_compositor.subdir = compositor + sub_compositor.depends = sub-qtwaylandscanner + sub_compositor.target = sub-compositor + SUBDIRS += sub_compositor -sub_client.subdir = client -sub_client.depends = sub-qtwaylandscanner -sub_client.target = sub-client -SUBDIRS += sub_client + sub_imports.subdir = imports + sub_imports.depends += sub-compositor + sub_imports.target = sub-imports + SUBDIRS += sub_imports + + sub_plugins.subdir = plugins + sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor + sub_plugins.target = sub-plugins + SUBDIRS += sub_plugins + } +} -sub_plugins.subdir = plugins -sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor -sub_plugins.target = sub-plugins -SUBDIRS += sub_plugins |