[tracker-miners] meson: Fix build when tracker.git is a subproject of tracker-miners
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners] meson: Fix build when tracker.git is a subproject of tracker-miners
- Date: Sun, 1 Jul 2018 23:21:37 +0000 (UTC)
commit f8a439cc5dcf4cdb630ab166f97a8fcd9b42bcfe
Author: Sam Thursfield <sam afuera me uk>
Date: Sun Jul 1 22:39:54 2018 +0200
meson: Fix build when tracker.git is a subproject of tracker-miners
This was a regression introduced in 2dd679b01597554abb46048c72a07.
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index b79e3300c..e73bd0ef7 100644
--- a/meson.build
+++ b/meson.build
@@ -25,8 +25,10 @@ if not tracker_sparql.found() or not tracker_miner.found()
tracker_miner = tracker_subproject.get_variable('tracker_miner_dep')
tracker_store = tracker_subproject.get_variable('tracker_store')
+ tracker_store_path = tracker_store.full_path()
else
tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store'))
+ tracker_store_path = find_program(join_paths(get_option('prefix'), get_option('libexecdir'),
'tracker-store')).path()
endif
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
@@ -327,7 +329,7 @@ conf.set('FUNCTIONAL_TESTS_TRACKER_EXTRACT_PATH', join_paths(meson.current_build
conf.set('FUNCTIONAL_TESTS_TRACKER_MINER_FS_PATH', join_paths(meson.current_build_dir(), 'src', 'miners',
'fs', 'tracker-miner-fs'))
conf.set('FUNCTIONAL_TESTS_TRACKER_WRITEBACK_PATH', join_paths(meson.current_build_dir(), 'src',
'tracker-writeback', 'tracker-writeback'))
-conf.set('FUNCTIONAL_TESTS_TRACKER_STORE_PATH', tracker_store.path())
+conf.set('FUNCTIONAL_TESTS_TRACKER_STORE_PATH', tracker_store_path)
configure_file(input: 'config.h.meson.in',
output: 'config.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]