diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-08-15 14:14:23 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-19 15:05:22 +0200 |
| commit | ffec8ce782cebd4432c10ad7fb467b89164b6a2d (patch) | |
| tree | 9785851d152f2bddb352ff5869a99ed21534f535 /src/src.pro | |
| parent | 12e0f9c10de85ef47c4fcc64dae627d8e2c71976 (diff) | |
Make it possible to build only the compositor module
Reduces unnecessary coupling between the compositor and client modules.
[ChangeLog][Compositor] The compositor module no longer depends on the
client module.
Change-Id: I108e56960835b6c31c450d5ae08a0a101af9422b
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/src.pro b/src/src.pro index d4244de33..3d68c69fb 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,21 +3,22 @@ include($$OUT_PWD/client/qtwaylandclient-config.pri) include($$OUT_PWD/compositor/qtwaylandcompositor-config.pri) QT_FOR_CONFIG += waylandclient-private waylandcompositor-private -qtConfig(wayland-client) { +qtConfig(wayland-client)|qtConfig(wayland-server) { sub_qtwaylandscanner.subdir = qtwaylandscanner sub_qtwaylandscanner.target = sub-qtwaylandscanner SUBDIRS += sub_qtwaylandscanner - sub_client.subdir = client - sub_client.depends = sub-qtwaylandscanner - sub_client.target = sub-client - SUBDIRS += sub_client + qtConfig(wayland-client) { + 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 - qtConfig(wayland-server) { - sub_plugins.depends += sub-compositor - } + sub_plugins.depends += sub-qtwaylandscanner + qtConfig(wayland-client):sub_plugins.depends += sub-client + qtConfig(wayland-server):sub_plugins.depends += sub-compositor sub_plugins.target = sub-plugins SUBDIRS += sub_plugins @@ -26,10 +27,11 @@ qtConfig(wayland-client) { sub_compositor.depends = sub-qtwaylandscanner sub_compositor.target = sub-compositor SUBDIRS += sub_compositor - - sub_imports.subdir = imports - sub_imports.depends += sub-compositor sub-client - sub_imports.target = sub-imports - SUBDIRS += sub_imports } + + sub_imports.subdir = imports + qtConfig(wayland-client):sub_imports.depends += sub-client + qtConfig(wayland-server):sub_imports.depends += sub-compositor + sub_imports.target = sub-imports + SUBDIRS += sub_imports } |