diff options
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 65 |
1 files changed, 38 insertions, 27 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index e5f9b9be..12c69da4 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -5,13 +5,24 @@ xwayland_required = [ 'xcb-render', 'xcb-xfixes', ] -xwayland_optional = [ - 'xcb-errors', - 'xcb-icccm', -] +xwayland_optional = { + 'xcb-errors': 'Required for printing X11 errors.', + 'xcb-icccm': 'Required for extended X11 window manager hints.', +} + +msg = [] +if get_option('xwayland').enabled() + msg += 'Install "@0@" or pass "-Dxwayland=disabled".' +endif +if not get_option('xwayland').disabled() + msg += 'Required for Xwayland support.' +endif foreach lib : xwayland_required - dep = dependency(lib, required: get_option('xwayland')) + dep = dependency(lib, + required: get_option('xwayland'), + not_found_message: '\n'.join(msg).format(lib), + ) if not dep.found() subdir_done() endif @@ -19,33 +30,33 @@ foreach lib : xwayland_required xwayland_libs += dep endforeach -foreach lib : xwayland_optional - dep = dependency(lib, required: get_option(lib)) +foreach lib, desc : xwayland_optional + msg = [] + if get_option(lib).enabled() + msg += 'Install "@0@" or pass "-D@0@=disabled".' + endif + if not get_option(lib).disabled() + msg += desc + endif + + dep = dependency(lib, + required: get_option(lib), + not_found_message: '\n'.join(msg).format(lib), + ) if dep.found() xwayland_libs += dep conf_data.set10('WLR_HAS_' + lib.underscorify().to_upper(), true) endif endforeach -lib_wlr_xwayland = static_library( - 'wlr_xwayland', - files( - 'selection/dnd.c', - 'selection/incoming.c', - 'selection/outgoing.c', - 'selection/selection.c', - 'sockets.c', - 'xwayland.c', - 'xwm.c', - ), - include_directories: wlr_inc, - dependencies: [ - wayland_server, - xwayland_libs, - xkbcommon, - pixman, - ], +wlr_files += files( + 'selection/dnd.c', + 'selection/incoming.c', + 'selection/outgoing.c', + 'selection/selection.c', + 'sockets.c', + 'xwayland.c', + 'xwm.c', ) - -wlr_parts += lib_wlr_xwayland +wlr_deps += xwayland_libs conf_data.set10('WLR_HAS_XWAYLAND', true) |