diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-13 23:02:19 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-10-25 15:56:32 +0200 |
| commit | 131cd41d343e76c13b825262fcb47d9e94c70b32 (patch) | |
| tree | 5f9bd0189323dfdd3216083b75e978ca841bb6c8 | |
| parent | 650bfc1a302fb7c7bdad2f5628fa047f5c57299e (diff) | |
| download | gvfs-131cd41d343e76c13b825262fcb47d9e94c70b32.tar.gz | |
build: Use get_variable method
Since meson 0.51 dependencies have a new generic `get_variable`
method[0], and in meson 0.56 the older `get_pkgconfig_variable` has
been deprecated[1].
All the calls to deprecated `get_pkgconfig_variable` have been
replaced by `get_variable`.
Required meson version has also been bumped to 0.56.
[0] https://mesonbuild.com/Release-notes-for-0-51-0.html#dependency-objects-now-have-a-get_variable-method
[1] https://mesonbuild.com/Release-notes-for-0-56-0.html#deprecate-dependencyget_pkgconfig_variable-and-dependencyget_configtool_variable
| -rw-r--r-- | meson.build | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meson.build b/meson.build index 1bf12101..52188993 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( version: '1.49.1', license: 'LGPL2+', default_options: 'buildtype=debugoptimized', - meson_version: '>= 0.55.0', + meson_version: '>= 0.56.0', ) gvfs_name = meson.project_name() @@ -249,23 +249,23 @@ endif config_h.set('HAVE_GCRYPT', enable_gcrypt) # *** Check for dbus service dir *** -dbus_session_bus_services_dir = dependency('dbus-1').get_pkgconfig_variable( - 'session_bus_services_dir', - define_variable: ['datadir', gvfs_prefix / gvfs_datadir], +dbus_session_bus_services_dir = dependency('dbus-1').get_variable( + pkgconfig: 'session_bus_services_dir', + pkgconfig_define: ['datadir', gvfs_prefix / gvfs_datadir], ) dbus_service_in = files('dbus.service.in') # *** Check for giomoduledir and schemasdir *** -gio_giomoduledir = gio_dep.get_pkgconfig_variable( - 'giomoduledir', - define_variable: ['libdir', gvfs_prefix / gvfs_libdir], +gio_giomoduledir = gio_dep.get_variable( + pkgconfig: 'giomoduledir', + pkgconfig_define: ['libdir', gvfs_prefix / gvfs_libdir], ) -gio_schemasdir = gio_dep.get_pkgconfig_variable( - 'schemasdir', - define_variable: ['datadir', gvfs_prefix / gvfs_datadir], - default: gvfs_prefix / gvfs_datadir / 'glib-2.0/schemas', +gio_schemasdir = gio_dep.get_variable( + pkgconfig: 'schemasdir', + pkgconfig_define: ['datadir', gvfs_prefix / gvfs_datadir], + default_value: gvfs_prefix / gvfs_datadir / 'glib-2.0/schemas', ) # *** Check for systemd options *** @@ -281,12 +281,12 @@ if install_systemd_systemduserunitdir or install_systemd_tmpfilesdir if install_systemd_systemduserunitdir and systemd_systemduserunitdir == '' assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it') - systemd_systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', define_variable: ['prefix', gvfs_prefix]) + systemd_systemduserunitdir = systemd_dep.get_variable(pkgconfig: 'systemduserunitdir', pkgconfig_define: ['prefix', gvfs_prefix]) endif if install_systemd_tmpfilesdir and systemd_tmpfilesdir == '' assert(systemd_dep.found(), 'systemd not found, if you use opentmpfiles please provide a valid systemd user unit dir or disable it') - systemd_tmpfilesdir = systemd_dep.get_pkgconfig_variable('tmpfilesdir', define_variable: ['prefix', gvfs_prefix]) + systemd_tmpfilesdir = systemd_dep.get_variable(pkgconfig: 'tmpfilesdir', pkgconfig_define: ['prefix', gvfs_prefix]) endif endif endif |