summaryrefslogtreecommitdiff
path: root/tests/libtracker-common
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-06-24 00:56:35 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-06-24 01:03:36 +0100
commit1ef2fb92c66078b9604ca7a1026f8e324f4495c3 (patch)
tree1841dca11eecff71de4f58cccdda1d1654ba54b7 /tests/libtracker-common
parent902f0d8e115f66bf015a0a368712601bddf47f41 (diff)
downloadtracker-1ef2fb92c66078b9604ca7a1026f8e324f4495c3.tar.gz
Fixes to Meson build system
First, instead of using add_global_arguments() we now use a variable to set global compiler args. It turns out that add_global_arguments() is broken if you ever want to include your project as a subproject of something else. Second, dependencies weren't being specified correctly. These are hopefully now fixed to avoid any more random build failures.
Diffstat (limited to 'tests/libtracker-common')
-rw-r--r--tests/libtracker-common/meson.build3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/libtracker-common/meson.build b/tests/libtracker-common/meson.build
index 03c99539f..6e1588a35 100644
--- a/tests/libtracker-common/meson.build
+++ b/tests/libtracker-common/meson.build
@@ -1,5 +1,4 @@
-test_c_args = [
- '-DTRACKER_COMPILATION',
+test_c_args = tracker_c_args + [
'-DTOP_BUILDDIR="@0@"'.format(meson.build_root()),
'-DTOP_SRCDIR="@0@"'.format(meson.source_root()),
]