diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-01-21 07:00:57 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-01-23 09:16:52 +0000 |
| commit | 0b07bf78f0556a0c4c7290ee8fc6b95a382cf2e9 (patch) | |
| tree | b2c76bee8c38b7c4e0e07c4525edee586ef7f8e6 | |
| parent | meson: 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.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index f5aec308..b57e4f3a 100644 --- a/meson.build +++ b/meson.build @@ -130,7 +130,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, ) @@ -140,7 +140,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, ) |
