[tracker-miners: 1/2] meson: Use tracker-testutils-2.0 to get path from pkg-config



commit ceb2fd459904d6eacfa88b3713b8c4992a0f0182
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Wed Sep 18 09:09:48 2019 +0200

    meson: Use tracker-testutils-2.0 to get path from pkg-config
    
    Related to https://gitlab.gnome.org/GNOME/tracker/merge_requests/140

 meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index e928dab46..91d229014 100644
--- a/meson.build
+++ b/meson.build
@@ -17,8 +17,9 @@ glib_required = '2.40.0'
 if get_option('tracker_core') == 'system'
   tracker_sparql = dependency('tracker-sparql-2.0', version: '>= 2.2.0', required: false)
   tracker_miner = dependency('tracker-miner-2.0', version: '>= 2.2.0', required: false)
+  tracker_testutils = dependency('tracker-testutils-2.0', required: false)
 
-  if not tracker_sparql.found() or not tracker_miner.found()
+  if not tracker_sparql.found() or not tracker_miner.found() or not tracker_testutils.found()
     error('Did not find the required versions of the Tracker core libraries ' +
           'installed in the system. Please ensure they are installed, or ' +
           'use the -Dtracker_core=subproject option to build from Git.')
@@ -40,7 +41,7 @@ if get_option('tracker_core') == 'system'
   tracker_uninstalled_domain_rule = join_paths 
(tracker_sparql.get_pkgconfig_variable('domain_ontologies_dir'), 'default.rule')
   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('datadir'), 
'tracker', 'stop-words')
-  tracker_uninstalled_testutils_dir = join_paths(tracker_sparql.get_pkgconfig_variable('libdir'), 
'tracker-2.0', 'trackertestutils')
+  tracker_uninstalled_testutils_dir = join_paths(tracker_testutils.get_pkgconfig_variable('python_path'), 
'tracker-2.0', 'trackertestutils')
 else
   tracker_subproject = subproject('tracker',
     default_options: [


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]