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

build: simplify get_variable calls

Browse Source 
With recent-ish Meson we can stop repeating the variable name for
each provider.
This commit is contained in:
Simon Ser 2021-09-15 19:01:14 +02:00 committed by Simon Zeni
parent 2e590026e9
commit 0c5ff5efab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xwayland/meson.build
View File

@ -1,7 +1,7 @@
have_listenfd = false have_listenfd = false
if xwayland.found() if xwayland.found()
xwayland_path = xwayland.get_variable(pkgconfig: 'xwayland') xwayland_path = xwayland.get_variable('xwayland')
have_listenfd = xwayland.get_variable(pkgconfig: 'have_listenfd') == 'true' have_listenfd = xwayland.get_variable('have_listenfd') == 'true'
else else
xwayland_path = xwayland_prog.full_path() xwayland_path = xwayland_prog.full_path()
endif endif

4
protocol/meson.build
View File

@ -3,11 +3,11 @@ wayland_protos = dependency('wayland-protocols',
fallback: ['wayland-protocols', 'wayland_protocols'], fallback: ['wayland-protocols', 'wayland_protocols'],
default_options: ['tests=false'], 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_dep = dependency('wayland-scanner', native: true)
wayland_scanner = find_program( wayland_scanner = find_program(
wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), wayland_scanner_dep.get_variable('wayland_scanner'),
native: true, native: true,
) )