aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-01-21 07:00:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-23 08:52:41 +0000
commite3a1dfcf5a0d5dab904827c5b6668933354502c5 (patch)
treee95cebb8d4a3a0560c9ed9c96ee52e8536c431f7
parentmeson: require epoll-shim on BSDs (diff)
meson: depend on wayland-client when using wayland-protocols
Base compiler on BSDs doesn't look where packages are installed to avoid tainting build environment. When system fcft is installed to the same prefix as wayland-client it passes CFLAGS that satisfy both but when using subprojects/fcft there's a build error. xdg-shell.c:33:10: fatal error: 'wayland-util.h' file not found xdg-decoration-unstable-v1.c:28:10: fatal error: 'wayland-util.h' file not found xdg-output-unstable-v1.c:28:10: fatal error: 'wayland-util.h' file not found presentation-time.c:28:10: fatal error: 'wayland-util.h' file not found primary-selection-unstable-v1.c:28:10: fatal error: 'wayland-util.h' file not found text-input-unstable-v3.c:33:10: fatal error: 'wayland-util.h' file not found In file included from ../../foot/grid.c:1: In file included from ../../foot/grid.h:5: In file included from ../../foot/terminal.h:19: ../../foot/wayland.h:8:10: fatal error: 'wayland-client.h' file not found In file included from ../../foot/selection.c:1: ../../foot/selection.h:4:10: fatal error: 'wayland-client.h' file not found
-rw-r--r--meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index dd3c07c1..eb95fa87 100644
--- a/meson.build
+++ b/meson.build
@@ -131,7 +131,7 @@ vtlib = static_library(
'vt.c', 'vt.h',
wl_proto_src + wl_proto_headers,
version,
- dependencies: [libepoll, pixman, fcft, tllist],
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client],
link_with: misc,
)
@@ -141,7 +141,7 @@ pgolib = static_library(
'selection.c', 'selection.h',
'terminal.c', 'terminal.h',
wl_proto_src + wl_proto_headers,
- dependencies: [libepoll, pixman, fcft, tllist],
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client],
link_with: vtlib,
)