From 0f9461c4c0e01d1778402685901d687350d23431 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sat, 13 Jul 2024 21:37:35 -0400 Subject: [PATCH] Make compilable with wlroots 0.19.0-dev --- meson.build | 8 +++++++- meson_options.txt | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meson_options.txt diff --git a/meson.build b/meson.build index 358736f..1c005b0 100644 --- a/meson.build +++ b/meson.build @@ -26,12 +26,18 @@ cc = meson.get_compiler('c') # Adding include directory inc_dir = include_directories('include') +if get_option('wlroots-version') != '' + wlroots_version = get_option('wlroots-version') +else + wlroots_version = ['wlroots-0.19', 'wlroots-0.18', 'wlroots'] +endif + libevdev = dependency('libevdev') libinput = dependency('libinput', version: '>=1.21.0') libxml2 = dependency('libxml-2.0') wayland_protos = dependency('wayland-protocols', version: '>=1.27') wayland_server = dependency('wayland-server', version: '>=1.15') -wlroots = dependency(['wlroots-0.18', 'wlroots'], version: '>=0.17.0') +wlroots = dependency(wlroots_version, version: '>=0.17.0') xkbcommon = dependency('xkbcommon') msgfmt = find_program('msgfmt', required: false) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..f32c01d --- /dev/null +++ b/meson_options.txt @@ -0,0 +1 @@ +option('wlroots-version', type: 'string', value: '', description: 'The version of wlroots with which to compile the compositor')