[tracker/sam/functional-tests-quiet: 9/10] Expose dbus_services_dir to dependent projects
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/sam/functional-tests-quiet: 9/10] Expose dbus_services_dir to dependent projects
- Date: Tue, 10 Sep 2019 09:37:10 +0000 (UTC)
commit dfae20472180f1ab68b808fadd253a1699c0a51a
Author: Sam Thursfield <sam afuera me uk>
Date: Sat Aug 31 03:20:05 2019 +0300
Expose dbus_services_dir to dependent projects
The tracker-miners tests now depend on the
tests/services/org.freedesktop.Tracker1.service file. We need to expose
it. The pkg-config variable is for situations where we build against an
installed Tracker core (so we use the normal service file, and honour
any custom location that the user specified for it). The Meson variable
is for when Tracker core is built as a subproject of tracker-miners.
meson.build | 1 +
src/libtracker-sparql/tracker-sparql.pc.in | 1 +
tests/services/meson.build | 2 ++
3 files changed, 4 insertions(+)
---
diff --git a/meson.build b/meson.build
index 5fe3ea07a..61373572d 100644
--- a/meson.build
+++ b/meson.build
@@ -275,6 +275,7 @@ conf.set('exec_prefix', get_option('prefix'))
conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
conf.set('datadir', datadir)
conf.set('datarootdir', join_paths(get_option('prefix'), get_option('datadir')))
+conf.set('dbus_services_dir', dbus_services_dir)
conf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
conf.set('libdir', libdir)
conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
diff --git a/src/libtracker-sparql/tracker-sparql.pc.in b/src/libtracker-sparql/tracker-sparql.pc.in
index dcdf0b7df..7b3aa3718 100644
--- a/src/libtracker-sparql/tracker-sparql.pc.in
+++ b/src/libtracker-sparql/tracker-sparql.pc.in
@@ -6,6 +6,7 @@ libexecdir=@libexecdir@
datadir=@datadir@
tracker_store=@tracker_store@
ontologies_dir=@ontologies_dir@
+dbus_services_dir=@dbus_services_dir@
domain_ontologies_dir=@domain_ontologies_dir@
Name: tracker-sparql
diff --git a/tests/services/meson.build b/tests/services/meson.build
index 182ba1e74..0223867e9 100644
--- a/tests/services/meson.build
+++ b/tests/services/meson.build
@@ -2,3 +2,5 @@ test_dbus_service_file = configure_file(
input: 'org.freedesktop.Tracker1.service.in',
output: 'org.freedesktop.Tracker1.service',
configuration: conf)
+
+tracker_test_dbus_services_dir = meson.current_build_dir()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]