nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 00:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: simplify Meson subproject fallbacks

Browse Source 
All of these projects use meson.override_dependency() so we can
stop referencing their internal variable name to grab the
depndencies we need.
This commit is contained in:
Simon Ser 2021-12-14 12:10:31 +01:00
parent 93e050c602
commit b5a019d575
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/session/meson.build
View File

@ -1,6 +1,6 @@
libseat = dependency('libseat', libseat = dependency('libseat',
version: '>=0.2.0', version: '>=0.2.0',
fallback: ['seatd', 'libseat'], fallback: 'seatd',
default_options: ['server=disabled', 'man-pages=disabled'], default_options: ['server=disabled', 'man-pages=disabled'],
) )
wlr_files += files('session.c') wlr_files += files('session.c')

2
backend/wayland/meson.build
View File

@ -1,5 +1,5 @@
wayland_client = dependency('wayland-client', wayland_client = dependency('wayland-client',
fallback: ['wayland', 'wayland_client_dep'], fallback: 'wayland',
default_options: wayland_project_options, default_options: wayland_project_options,
) )
wlr_deps += wayland_client wlr_deps += wayland_client

4
meson.build
View File

@ -100,13 +100,13 @@ internal_features = {
wayland_project_options = ['tests=false', 'documentation=false'] wayland_project_options = ['tests=false', 'documentation=false']
wayland_server = dependency('wayland-server', wayland_server = dependency('wayland-server',
version: '>=1.20', version: '>=1.20',
fallback: ['wayland', 'wayland_server_dep'], fallback: 'wayland',
default_options: wayland_project_options, default_options: wayland_project_options,
) )
drm = dependency('libdrm', drm = dependency('libdrm',
version: '>=2.4.109', version: '>=2.4.109',
fallback: ['libdrm', 'ext_libdrm'], fallback: 'libdrm',
default_options: [ default_options: [
'libkms=false', 'libkms=false',
'intel=false', 'intel=false',

2
protocol/meson.build
View File

@ -1,6 +1,6 @@
wayland_protos = dependency('wayland-protocols', wayland_protos = dependency('wayland-protocols',
version: '>=1.24', version: '>=1.24',
fallback: ['wayland-protocols', 'wayland_protocols'], fallback: 'wayland-protocols',
default_options: ['tests=false'], default_options: ['tests=false'],
) )
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')