[tracker-miners/wip/carlosg/compiler-warnings: 11/12] build: Avoid pkg.get_pkgconfig_variable()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/compiler-warnings: 11/12] build: Avoid pkg.get_pkgconfig_variable()
- Date: Sun, 28 Aug 2022 21:28:01 +0000 (UTC)
commit 5048df1fcc41d281437da487b476bc557c4d4b37
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Aug 28 23:15:01 2022 +0200
build: Avoid pkg.get_pkgconfig_variable()
Use dep.get_variable() available in meson 0.51.
meson.build | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index ad4be2dcd..849fb32ef 100644
--- a/meson.build
+++ b/meson.build
@@ -30,13 +30,13 @@ if get_option('tracker_core') == 'system'
# If we are building against an installed version of tracker core rather than
# having it as a subproject, these 'uninstalled' locations point to the actual
# installed locations.
- tracker_uninstalled_cli_dir = join_paths (tracker_sparql.get_pkgconfig_variable('exec_prefix'), 'bin')
- tracker_uninstalled_nepomuk_ontologies_dir =
join_paths(tracker_sparql.get_pkgconfig_variable('ontologies_dir'), 'nepomuk')
- tracker_uninstalled_stop_words_dir = join_paths(tracker_sparql.get_pkgconfig_variable('tracker_datadir'),
'stop-words')
- tracker_uninstalled_testutils_dir = tracker_testutils.get_pkgconfig_variable('python_path')
- tracker_ontologies_dir = tracker_sparql.get_pkgconfig_variable('ontologies_dir')
+ tracker_uninstalled_cli_dir = join_paths (tracker_sparql.get_variable(pkgconfig: 'exec_prefix'), 'bin')
+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_sparql.get_variable(pkgconfig:
'ontologies_dir'), 'nepomuk')
+ tracker_uninstalled_stop_words_dir = join_paths(tracker_sparql.get_variable(pkgconfig: 'tracker_datadir'),
'stop-words')
+ tracker_uninstalled_testutils_dir = tracker_testutils.get_variable(pkgconfig: 'python_path')
+ tracker_ontologies_dir = tracker_sparql.get_variable(pkgconfig: 'ontologies_dir')
- tracker_sparql_uninstalled_dir = tracker_sparql.get_pkgconfig_variable('libdir')
+ tracker_sparql_uninstalled_dir = tracker_sparql.get_variable(pkgconfig: 'libdir')
else
tracker_subproject = subproject('tracker')
@@ -331,8 +331,8 @@ endif
dbus_services_dir = get_option('dbus_services_dir')
if dbus_services_dir == ''
- dbus_services_dir = dbus.get_pkgconfig_variable('session_bus_services_dir',
- define_variable: [ 'datadir', datadir ])
+ dbus_services_dir = dbus.get_variable(pkgconfig: 'session_bus_services_dir',
+ pkgconfig_define: [ 'datadir', datadir ])
endif
####################################################################
@@ -345,8 +345,8 @@ if get_option('systemd_user_services')
if systemd_user_services_dir == ''
systemd = dependency('systemd', version: '>= 242', required: false)
if systemd.found()
- systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir',
- define_variable: ['prefix',
get_option('prefix')])
+ systemd_user_services_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir',
+ pkgconfig_define: ['prefix', get_option('prefix')])
else
error('systemd user services were enabled, but systemd was not found. ' +
'Please set the systemd_user_services_dir option if you want to ' +
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]