Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

Commit

Permalink
build: simplify get_variable calls
Browse files Browse the repository at this point in the history
With recent-ish Meson we can stop repeating the variable name for
each provider.
  • Loading branch information
emersion authored and bl4ckb0ne committed Sep 21, 2021
1 parent 2e59002 commit 0c5ff5e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions include/xwayland/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
have_listenfd = false
if xwayland.found()
xwayland_path = xwayland.get_variable(pkgconfig: 'xwayland')
have_listenfd = xwayland.get_variable(pkgconfig: 'have_listenfd') == 'true'
xwayland_path = xwayland.get_variable('xwayland')
have_listenfd = xwayland.get_variable('have_listenfd') == 'true'
else
xwayland_path = xwayland_prog.full_path()
endif
Expand Down
4 changes: 2 additions & 2 deletions protocol/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ wayland_protos = dependency('wayland-protocols',
fallback: ['wayland-protocols', 'wayland_protocols'],
default_options: ['tests=false'],
)
wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir', internal: 'pkgdatadir')
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')

wayland_scanner_dep = dependency('wayland-scanner', native: true)
wayland_scanner = find_program(
wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
wayland_scanner_dep.get_variable('wayland_scanner'),
native: true,
)

Expand Down

0 comments on commit 0c5ff5e

Please sign in to comment.