mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: use Dependency.get_variable instead of get_pkgconfig_variable

Browse source 
Dependency.get_pkgconfig_variable has been deprecated.
This commit is contained in:
Simon Ser 2021-06-25 16:24:22 +02:00
parent 8348178c66
commit 5f3773f21e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
meson.build
View file

@ -128,7 +128,7 @@ conf_data.set10('HAVE_TRAY', have_tray)
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found() if scdoc.found()
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
sh = find_program('sh', native: true) sh = find_program('sh', native: true)
mandir = get_option('mandir') mandir = get_option('mandir')
man_files = [ man_files = [
@ -278,9 +278,9 @@ if get_option('bash-completions')
'completions/bash/swaymsg', 'completions/bash/swaymsg',
) )
if bash_comp.found() if bash_comp.found()
bash_install_dir = bash_comp.get_pkgconfig_variable( bash_install_dir = bash_comp.get_variable(
'completionsdir', pkgconfig: 'completionsdir',
define_variable: ['datadir', datadir] pkgconfig_define: ['datadir', datadir]
) )
else else
bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
@ -296,9 +296,9 @@ if get_option('fish-completions')
'completions/fish/swaynag.fish', 'completions/fish/swaynag.fish',
) )
if fish_comp.found() if fish_comp.found()
fish_install_dir = fish_comp.get_pkgconfig_variable( fish_install_dir = fish_comp.get_variable(
'completionsdir', pkgconfig: 'completionsdir',
define_variable: ['datadir', datadir] pkgconfig_define: ['datadir', datadir]
) )
else else
fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d') fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d')

4
protocols/meson.build
View file

@ -1,9 +1,9 @@
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir')
wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
if wayland_scanner_dep.found() if wayland_scanner_dep.found()
wayland_scanner = find_program( wayland_scanner = find_program(
wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'), wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
native: true, native: true,
) )
else else