From 4887f1a7aad767a74e36dcb3dda97fd61ba8e8a7 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 22 Nov 2021 14:41:23 +0100 Subject: [PATCH] build: add Meson fallback for wayland-protocols This allows easily co-developing a Wayland protocol and Weston. Example setup: ln -s subprojects/wayland-protocols /path/to/wayland-protocols meson configure build/ --force-fallback-for=wayland-protocols Signed-off-by: Simon Ser --- meson.build | 2 +- protocol/meson.build | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 82796740..8498ec1f 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('weston', 'c_std=gnu99', 'b_lundef=true', ], - meson_version: '>= 0.52.1', + meson_version: '>= 0.54.0', license: 'MIT/Expat', ) diff --git a/protocol/meson.build b/protocol/meson.build index 3ff640e1..efc1281f 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,8 +1,9 @@ dep_scanner = dependency('wayland-scanner', native: true) prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) -dep_wp = dependency('wayland-protocols', version: '>= 1.24') -dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') +dep_wp = dependency('wayland-protocols', version: '>= 1.24', + fallback: ['wayland-protocols', 'wayland_protocols']) +dir_wp_base = dep_wp.get_variable(pkgconfig: 'pkgdatadir', internal: 'pkgdatadir') install_data( [