diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
| commit | fd3fa760d336312acafeb6812b5b0068f5851f27 (patch) | |
| tree | 6876337b81c01c13d53d6c4f2e3680c51fd9e204 /xwayland | |
| parent | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (diff) | |
Revert "Revert "Merge pull request #1194 from ascent12/meson_feature""
This reverts commit 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0.
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index ec486f58..0bd88924 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -1,3 +1,32 @@ +xwayland_libs = [] +xwayland_required = [ + 'xcb', + 'xcb-composite', + 'xcb-render', + 'xcb-xfixes', +] +xwayland_optional = [ + 'xcb-errors', + 'xcb-icccm', +] + +foreach lib : xwayland_required + dep = dependency(lib, required: get_option('xwayland')) + if not dep.found() + subdir_done() + endif + + xwayland_libs += dep +endforeach + +foreach lib : xwayland_optional + dep = dependency(lib, required: get_option(lib)) + if dep.found() + xwayland_libs += dep + conf_data.set('WLR_HAS_' + lib.underscorify().to_upper(), true) + endif +endforeach + lib_wlr_xwayland = static_library( 'wlr_xwayland', files( @@ -12,14 +41,11 @@ lib_wlr_xwayland = static_library( include_directories: wlr_inc, dependencies: [ wayland_server, - xcb, - xcb_composite, - xcb_xfixes, - xcb_image, - xcb_render, - xcb_icccm, - xcb_errors, + xwayland_libs, xkbcommon, pixman, ], ) + +wlr_parts += lib_wlr_xwayland +conf_data.set('WLR_HAS_XWAYLAND', true) |