From 5d5f7a132c6b3a356ca8a6ed42c62b4b27230305 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 28 May 2024 09:54:59 +0800 Subject: [PATCH] meson: use versioned wlroots for dependency() Adapt to upstream change at https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614 --- meson.build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 3c444e077..015adbf0e 100644 --- a/meson.build +++ b/meson.build @@ -37,15 +37,20 @@ if is_freebsd add_project_arguments('-D_C11_SOURCE', language: 'c') endif -# Execute the wlroots subproject, if any +wlroots_version_major = '0.18' wlroots_version = ['>=0.18.0', '<0.19.0'] -subproject( +# Execute the wlroots subproject, if any +wlroots_subproject = subproject( 'wlroots', default_options: ['examples=false'], required: false, version: wlroots_version, ) -wlroots = dependency('wlroots', version: wlroots_version) +if wlroots_subproject.found() + wlroots = dependency('wlroots', version: wlroots_version) +else + wlroots = dependency('wlroots-' + wlroots_version_major, version: wlroots_version) +endif wlroots_features = { 'xwayland': false, 'libinput_backend': false,