mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use kwargs for wayland deps

Browse source
This commit is contained in:
Kirill Primak 2024-11-16 20:04:58 +03:00 • committed by Simon Ser
parent f233d25e86
commit 2ff95e5c97
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/wayland/meson.build
View file

@ -1,6 +1,5 @@
wayland_client = dependency('wayland-client', wayland_client = dependency('wayland-client',
fallback: 'wayland', kwargs: wayland_kwargs,
default_options: wayland_project_options,
) )
wlr_deps += wayland_client wlr_deps += wayland_client

13
meson.build
View file

@ -83,11 +83,16 @@ internal_features = {
} }
internal_config = configuration_data() internal_config = configuration_data()
wayland_project_options = ['tests=false', 'documentation=false'] wayland_kwargs = {
'version': '>=1.23',
'fallback': 'wayland',
'default_options': [
'tests=false',
'documentation=false',
],
}
wayland_server = dependency('wayland-server', wayland_server = dependency('wayland-server',
version: '>=1.23', kwargs: wayland_kwargs,
fallback: 'wayland',
default_options: wayland_project_options,
) )
drm = dependency('libdrm', drm = dependency('libdrm',

5
protocol/meson.build
View file

@ -5,7 +5,10 @@ wayland_protos = dependency('wayland-protocols',
) )
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
wayland_scanner_dep = dependency('wayland-scanner', native: true) wayland_scanner_dep = dependency('wayland-scanner',
kwargs: wayland_kwargs,
native: true,
)
wayland_scanner = find_program( wayland_scanner = find_program(
wayland_scanner_dep.get_variable('wayland_scanner'), wayland_scanner_dep.get_variable('wayland_scanner'),
native: true, native: true,