From 03e1b906abc6b29bb4b76b6e0429b8da9e2e2c0e Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 11 May 2021 17:58:40 +0200 Subject: meson: add xdg-activation-v1.xml conditionally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only enable XDG activation when compiling against wayland-protocols 1.21. Older versions don’t have this protocol. When available, define HAVE_XDG_ACTIVATION. Make all usages of xdg_activation_v1 and xdg_activation_token_v1 conditional. --- meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index b78079c3..0c48929a 100644 --- a/meson.build +++ b/meson.build @@ -88,16 +88,21 @@ wscanner_prog = find_program( wl_proto_headers = [] wl_proto_src = [] -foreach prot : [ +wl_proto_xml = [ wayland_protocols_datadir + '/stable/xdg-shell/xdg-shell.xml', wayland_protocols_datadir + '/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', wayland_protocols_datadir + '/unstable/xdg-output/xdg-output-unstable-v1.xml', wayland_protocols_datadir + '/unstable/primary-selection/primary-selection-unstable-v1.xml', wayland_protocols_datadir + '/stable/presentation-time/presentation-time.xml', wayland_protocols_datadir + '/unstable/text-input/text-input-unstable-v3.xml', - wayland_protocols_datadir + '/staging/xdg-activation/xdg-activation-v1.xml', ] +if wayland_protocols.version().version_compare('>=1.21') + add_project_arguments('-DHAVE_XDG_ACTIVATION', language: 'c') + wl_proto_xml += [wayland_protocols_datadir + '/staging/xdg-activation/xdg-activation-v1.xml'] +endif + +foreach prot : wl_proto_xml wl_proto_headers += custom_target( prot.underscorify() + '-client-header', output: '@BASENAME@.h', -- cgit v1.3