mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Stop using deprecated dep.get_pkgconfig_variable() method

Browse Source 
Use generic get_variable() instead
This commit is contained in:
Marco Trevisan (Treviño)
2024-02-20 01:00:29 +01:00
parent 3e5ab6fdad
commit 5501dc7b47
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/meson.build
View File

@@ -19,7 +19,7 @@ content_files = [
expand_content_files = content_files expand_content_files = content_files
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html') docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')

4
meson.build
View File

@@ -269,7 +269,7 @@ if install_udev_rules
udev_rules_dir = get_option('udev_rules_dir') udev_rules_dir = get_option('udev_rules_dir')
if udev_rules_dir == 'auto' if udev_rules_dir == 'auto'
udev_dep = dependency('udev') udev_dep = dependency('udev')
udev_rules_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/rules.d' udev_rules_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/rules.d'
endif endif
endif endif
@@ -306,7 +306,7 @@ if not udev_hwdb.disabled()
if udev_hwdb_dir == 'auto' if udev_hwdb_dir == 'auto'
udev_dep = dependency('udev') udev_dep = dependency('udev')
udev_hwdb_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/hwdb.d' udev_hwdb_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/hwdb.d'
endif endif
else else
udev_hwdb_dir = '' udev_hwdb_dir = ''

2
tests/meson.build
View File

@@ -339,7 +339,7 @@ endif
valgrind = find_program('valgrind', required: false) valgrind = find_program('valgrind', required: false)
if valgrind.found() if valgrind.found()
glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name() glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name()
glib_suppressions = glib_share + '/valgrind/glib.supp' glib_suppressions = glib_share + '/valgrind/glib.supp'
libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(), libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(),
files('libfprint.supp')[0]) files('libfprint.supp')[0])