diff options
| author | Simon Ser <contact@emersion.fr> | 2021-12-14 12:10:31 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-12-19 18:12:16 +0000 |
| commit | b5a019d5754064788471e9eba4ee9354c7cc4cd5 (patch) | |
| tree | 6e6f386d2151bfe73415d533faabc2408862dc72 | |
| parent | 93e050c602df91b00454046b12dc7331a555c437 (diff) | |
build: simplify Meson subproject fallbacks
All of these projects use meson.override_dependency() so we can
stop referencing their internal variable name to grab the
depndencies we need.
| -rw-r--r-- | backend/session/meson.build | 2 | ||||
| -rw-r--r-- | backend/wayland/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | protocol/meson.build | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/backend/session/meson.build b/backend/session/meson.build index 66c908a2..27915506 100644 --- a/backend/session/meson.build +++ b/backend/session/meson.build @@ -1,6 +1,6 @@ libseat = dependency('libseat', version: '>=0.2.0', - fallback: ['seatd', 'libseat'], + fallback: 'seatd', default_options: ['server=disabled', 'man-pages=disabled'], ) wlr_files += files('session.c') diff --git a/backend/wayland/meson.build b/backend/wayland/meson.build index 103d3f9f..1831bbb3 100644 --- a/backend/wayland/meson.build +++ b/backend/wayland/meson.build @@ -1,5 +1,5 @@ wayland_client = dependency('wayland-client', - fallback: ['wayland', 'wayland_client_dep'], + fallback: 'wayland', default_options: wayland_project_options, ) wlr_deps += wayland_client diff --git a/meson.build b/meson.build index 24aa6f7a..f7fb659c 100644 --- a/meson.build +++ b/meson.build @@ -100,13 +100,13 @@ internal_features = { wayland_project_options = ['tests=false', 'documentation=false'] wayland_server = dependency('wayland-server', version: '>=1.20', - fallback: ['wayland', 'wayland_server_dep'], + fallback: 'wayland', default_options: wayland_project_options, ) drm = dependency('libdrm', version: '>=2.4.109', - fallback: ['libdrm', 'ext_libdrm'], + fallback: 'libdrm', default_options: [ 'libkms=false', 'intel=false', diff --git a/protocol/meson.build b/protocol/meson.build index 3e34f788..ae2b2ef4 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,6 +1,6 @@ wayland_protos = dependency('wayland-protocols', version: '>=1.24', - fallback: ['wayland-protocols', 'wayland_protocols'], + fallback: 'wayland-protocols', default_options: ['tests=false'], ) wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') |