aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-05-01 20:24:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-05-01 20:47:35 +0000
commit7edda924a0ac962c98fac8342a474b6a2a057c1d (patch)
treedf2aa0aab56d76077d7df5e08221b458da1c8b7a
parentMerge branch 'bsu-esu-logging' (diff)
meson: add ‘xkb’ as a dependency to vtlib, pgolib and pgo
All of these include wayland.h (either directly, or indirectly), which pulls in xkbcommon.h. Reported by swayyyy on IRC: FAILED: libvtlib.a.p/dcs.c.o In file included from ../../terminal.h:19, from ../../dcs.h:4, from ../../dcs.c:1: ../../wayland.h:9:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory 9 | #include <xkbcommon/xkbcommon.h> | ^
-rw-r--r--meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index cfdbe98d..370501f5 100644
--- a/meson.build
+++ b/meson.build
@@ -143,7 +143,7 @@ vtlib = static_library(
'vt.c', 'vt.h',
wl_proto_src + wl_proto_headers,
version,
- dependencies: [libepoll, pixman, fcft, tllist, wayland_client],
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb],
link_with: [common, misc],
)
@@ -153,7 +153,7 @@ pgolib = static_library(
'selection.c', 'selection.h',
'terminal.c', 'terminal.h',
wl_proto_src + wl_proto_headers,
- dependencies: [libepoll, pixman, fcft, tllist, wayland_client],
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb],
link_with: vtlib,
)
@@ -162,7 +162,7 @@ if get_option('b_pgo') == 'generate'
'pgo',
'pgo/pgo.c',
wl_proto_src + wl_proto_headers,
- dependencies: [math, threads, libepoll, pixman, wayland_client, fcft, tllist],
+ dependencies: [math, threads, libepoll, pixman, wayland_client, xkb, fcft, tllist],
link_with: pgolib,
)
endif