[gtk/wip/carlosg/imwayland-for-master] build: wrap IM protocol building under have_wayland altogether
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/carlosg/imwayland-for-master] build: wrap IM protocol building under have_wayland altogether
- Date: Tue, 18 Dec 2018 19:53:32 +0000 (UTC)
commit beb9ee6d4ab5be4c673d5206f06517b8a9a67486
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Dec 18 20:51:22 2018 +0100
build: wrap IM protocol building under have_wayland altogether
We poke variables that might not be defined if the wayland backend
is disabled.
gtk/meson.build | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 29ad14f64a..cc021d7fea 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -637,16 +637,16 @@ foreach p: proto_sources
proto_name = p.get(0)
proto_stability = p.get(1)
- if proto_stability == 'stable'
- output_base = proto_name
- input = '@0@.xml'.format(proto_name)
- else
- proto_version = p.get(2)
- output_base = '@0@-@1@-@2@'.format(proto_name, proto_stability, proto_version)
- input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
- endif
-
if wayland_enabled
+ if proto_stability == 'stable'
+ output_base = proto_name
+ input = '@0@.xml'.format(proto_name)
+ else
+ proto_version = p.get(2)
+ output_base = '@0@-@1@-@2@'.format(proto_name, proto_stability, proto_version)
+ input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
+ endif
+
# wayland_scanner is defined in gdk/wayland/meson.build
im_wayland_sources += custom_target('@0@ client header'.format(output_base),
input: input,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]