sway

commit d6095588a143710d25be47577ea65517770e7a74
parent fe39129b96794032c396411f96f2eb016050a545
Author: Michel Ganguin <michel@ganguin.net>
Date:   Thu,  2 Aug 2018 09:36:47 +0200

Link xcb dependency to meson options "enable_xwayland" (#2393)

* Link xcb dependency to meson options "enable_xwayland"

* Link xcb dependency to meson options "enable_xwayland"

Diffstat:
M
meson.build
 | 
2
+-
M
sway/meson.build
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
@@ -44,13 +44,13 @@ systemd        = dependency('libsystemd', required: false)
 elogind        = dependency('libelogind', required: false)
 math           = cc.find_library('m')
 rt             = cc.find_library('rt')
-xcb            = dependency('xcb')
 git            = find_program('git', required: false)
 
 conf_data = configuration_data()
 
 if get_option('enable-xwayland')
 	conf_data.set('HAVE_XWAYLAND', true)
+	xcb = dependency('xcb')
 else
 	conf_data.set('HAVE_XWAYLAND', false)
 endif
diff --git a/sway/meson.build b/sway/meson.build
@@ -153,10 +153,6 @@ sway_sources = files(
 	'tree/output.c',
 )
 
-if get_option('enable-xwayland')
-	sway_sources += 'desktop/xwayland.c'
-endif
-
 sway_deps = [
 	cairo,
 	gdk_pixbuf,
@@ -170,10 +166,14 @@ sway_deps = [
 	server_protos,
 	wayland_server,
 	wlroots,
-	xcb,
 	xkbcommon,
 ]
 
+if get_option('enable-xwayland')
+	sway_sources += 'desktop/xwayland.c'
+	sway_deps += xcb
+endif
+
 executable(
 	'sway',
 	sway_sources,