[tracker/wip/sam/meson] Work around the Meson issue
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/sam/meson] Work around the Meson issue
- Date: Sun, 4 Dec 2016 15:52:59 +0000 (UTC)
commit 81ce236d66724724f76fd1a2c516de096a5fcdcd
Author: Sam Thursfield <sam afuera me uk>
Date: Sun Dec 4 15:52:23 2016 +0000
Work around the Meson issue
If we don't list any 'redundant' dependencies, we don't trigger the bug.
src/libtracker-direct/meson.build | 5 +++--
tests/functional-tests/ipc/meson.build | 20 ++++++++++----------
utils/tracker-resdump/meson.build | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-direct/meson.build b/src/libtracker-direct/meson.build
index 67da137..8e2a5c6 100644
--- a/src/libtracker-direct/meson.build
+++ b/src/libtracker-direct/meson.build
@@ -4,8 +4,9 @@ libtracker_direct = static_library('tracker-direct',
'../libtracker-common/libtracker-common.vapi',
'../libtracker-data/libtracker-data.vapi',
'../libtracker-data/tracker-sparql-query.vapi',
- #link_with: [libtracker_common, libtracker_data, libtracker_sparql_intermediate],
- dependencies: [tracker_common_dep, tracker_data_dep, tracker_sparql_intermediate_dep],
+ dependencies: [
+ tracker_data_dep,
+ tracker_sparql_intermediate_dep],
c_args: [
'-DTRACKER_COMPILATION',
],
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build
index c458ac8..31bc9a6 100644
--- a/tests/functional-tests/ipc/meson.build
+++ b/tests/functional-tests/ipc/meson.build
@@ -1,53 +1,53 @@
insert_or_replace_test = executable('test-insert-or-replace',
'test-insert-or-replace.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-insert-or-replace', insert_or_replace_test)
busy_handling_test = executable('test-busy-handling',
'test-busy-handling.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-busy-handling', busy_handling_test)
direct_query_test = executable('test-direct-query',
'test-direct-query.vala',
'test-shared-query.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-direct-query', direct_query_test)
bus_query_test = executable('test-bus-query',
'test-bus-query.vala',
'test-shared-query.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep, tracker_sparql_bus_dep])
+ dependencies: [tracker_sparql_dep, tracker_sparql_bus_dep])
test('functional-ipc-bus-query', bus_query_test)
default_update_test = executable('test-default-update',
'test-default-update.vala',
'test-shared-update.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-default-update', default_update_test)
bus_update_test = executable('test-bus-update',
'test-bus-update.vala',
'test-shared-update.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep, tracker_sparql_bus_dep])
+ dependencies: [tracker_sparql_dep, tracker_sparql_bus_dep])
test('functional-ipc-bus-update', bus_update_test)
class_signal_test = executable('test-class-signal',
'test-class-signal.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-class-signal', class_signal_test)
class_signal_performance_test = executable('test-class-signal-performance',
'test-class-signal-performance.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-class-signal-performance', class_signal_performance_test)
class_signal_performance_batch_test = executable('test-class-signal-performance-batch',
'test-class-signal-performance-batch.vala',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-class-signal-performance-batch', class_signal_performance_batch_test)
update_array_performance_test = executable('test-update-array-performance',
'test-update-array-performance.c',
- dependencies: [tracker_common_dep, tracker_sparql_dep])
+ dependencies: [tracker_sparql_dep])
test('functional-ipc-update-array-performance', update_array_performance_test)
diff --git a/utils/tracker-resdump/meson.build b/utils/tracker-resdump/meson.build
index 770a506..442d97b 100644
--- a/utils/tracker-resdump/meson.build
+++ b/utils/tracker-resdump/meson.build
@@ -1,2 +1,2 @@
executable('tracker-resdump', 'tracker-resdump.vala',
- dependencies: [tracker_common_dep, tracker_data_dep, tracker_sparql_dep, gee])
+ dependencies: [tracker_sparql_dep, gee])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]