diff options
| author | Simon Ser <contact@emersion.fr> | 2021-06-25 16:24:22 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-06-30 13:37:00 +0200 |
| commit | 5f3773f21e3828f87f4e72b0dcb3b8a362024463 (patch) | |
| tree | 9d396606c0bbcca9c0004e1081a34a6797b86ca2 | |
| parent | 8348178c66c3c2e398013a745365b36636222c52 (diff) | |
build: use Dependency.get_variable instead of get_pkgconfig_variable
Dependency.get_pkgconfig_variable has been deprecated.
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | protocols/meson.build | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 7ff085b5..ee7c43f1 100644 --- a/meson.build +++ b/meson.build @@ -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')) 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) mandir = get_option('mandir') man_files = [ @@ -278,9 +278,9 @@ if get_option('bash-completions') 'completions/bash/swaymsg', ) if bash_comp.found() - bash_install_dir = bash_comp.get_pkgconfig_variable( - 'completionsdir', - define_variable: ['datadir', datadir] + bash_install_dir = bash_comp.get_variable( + pkgconfig: 'completionsdir', + pkgconfig_define: ['datadir', datadir] ) else bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') @@ -296,9 +296,9 @@ if get_option('fish-completions') 'completions/fish/swaynag.fish', ) if fish_comp.found() - fish_install_dir = fish_comp.get_pkgconfig_variable( - 'completionsdir', - define_variable: ['datadir', datadir] + fish_install_dir = fish_comp.get_variable( + pkgconfig: 'completionsdir', + pkgconfig_define: ['datadir', datadir] ) else fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d') diff --git a/protocols/meson.build b/protocols/meson.build index 124e9777..8c4ae0af 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -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) if wayland_scanner_dep.found() wayland_scanner = find_program( - wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'), + wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), native: true, ) else |