[grilo/ebassi/subproject-variables: 2/8] build: Do not use deprecated get_pkgconfig_variable()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/ebassi/subproject-variables: 2/8] build: Do not use deprecated get_pkgconfig_variable()
- Date: Tue, 27 Sep 2022 13:32:14 +0000 (UTC)
commit 2b6681d1bed456ca9c241dd9901dbc3652e6c9a7
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Sep 27 13:59:58 2022 +0100
build: Do not use deprecated get_pkgconfig_variable()
Use get_variable(pkgconfig: ...) instead.
meson.build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 21f566b..7d84270 100644
--- a/meson.build
+++ b/meson.build
@@ -96,16 +96,16 @@ typelibdir = join_paths(libdir, 'girepository-1.0')
typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
gobject_introspection = dependency('gobject-introspection-1.0', required: false)
if gobject_introspection.found()
- girdir = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir', datadir])
- girdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir',
'${datadir}'])
- typelibdir = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable: ['libdir',
libdir])
- typelibdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable:
['libdir', '${libdir}'])
+ girdir = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir])
+ girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define:
['datadir', '${datadir}'])
+ typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir',
libdir])
+ typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define:
['libdir', '${libdir}'])
endif
vapidir = join_paths(datadir, 'vala', 'vapi')
vapigen = dependency('vapigen', required: false)
if vapigen.found()
- vapidir = vapigen.get_pkgconfig_variable('vapidir', define_variable: ['datadir', datadir])
+ vapidir = vapigen.get_variable(pkgconfig: 'vapidir', pkgconfig_define: ['datadir', datadir])
endif
cdata = configuration_data()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]