diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-24 00:56:35 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-24 01:03:36 +0100 |
commit | 1ef2fb92c66078b9604ca7a1026f8e324f4495c3 (patch) | |
tree | 1841dca11eecff71de4f58cccdda1d1654ba54b7 /tests | |
parent | 902f0d8e115f66bf015a0a368712601bddf47f41 (diff) | |
download | tracker-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')
-rw-r--r-- | tests/libtracker-common/meson.build | 3 | ||||
-rw-r--r-- | tests/libtracker-data/meson.build | 3 | ||||
-rw-r--r-- | tests/libtracker-extract/meson.build | 3 | ||||
-rw-r--r-- | tests/libtracker-fts/meson.build | 3 | ||||
-rw-r--r-- | tests/libtracker-sparql/meson.build | 8 | ||||
-rw-r--r-- | tests/tracker-steroids/meson.build | 4 |
6 files changed, 8 insertions, 16 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()), ] diff --git a/tests/libtracker-data/meson.build b/tests/libtracker-data/meson.build index 84a9e5b46..29b720f9e 100644 --- a/tests/libtracker-data/meson.build +++ b/tests/libtracker-data/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()), ] diff --git a/tests/libtracker-extract/meson.build b/tests/libtracker-extract/meson.build index 9c0a5544d..6859510c5 100644 --- a/tests/libtracker-extract/meson.build +++ b/tests/libtracker-extract/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()), ] diff --git a/tests/libtracker-fts/meson.build b/tests/libtracker-fts/meson.build index ae6c6ec0f..09f6891f2 100644 --- a/tests/libtracker-fts/meson.build +++ b/tests/libtracker-fts/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()), ] diff --git a/tests/libtracker-sparql/meson.build b/tests/libtracker-sparql/meson.build index 91ab4a0d1..c2806a725 100644 --- a/tests/libtracker-sparql/meson.build +++ b/tests/libtracker-sparql/meson.build @@ -1,19 +1,17 @@ -test_c_args = ['-DTRACKER_COMPILATION'] - resource_test = executable('tracker-resource-test', 'tracker-resource-test.c', dependencies: [tracker_common_dep, tracker_sparql_dep], - c_args: test_c_args) + c_args: tracker_c_args) test('sparql-resource', resource_test) sparql_test = executable('tracker-sparql-test', 'tracker-sparql-test.c', dependencies: [tracker_common_dep, tracker_sparql_dep], - c_args: test_c_args) + c_args: tracker_c_args) test('sparql', sparql_test) gb_737023_test = executable('tracker-gb-737023-test', 'tracker-gb-737023.c', dependencies: [tracker_common_dep, tracker_sparql_dep], - c_args: test_c_args) + c_args: tracker_c_args) test('gb_737023', sparql_test) diff --git a/tests/tracker-steroids/meson.build b/tests/tracker-steroids/meson.build index 4cc69dcc4..0cb06ab26 100644 --- a/tests/tracker-steroids/meson.build +++ b/tests/tracker-steroids/meson.build @@ -1,7 +1,5 @@ -test_c_args = ['-DTRACKER_COMPILATION'] - steroids_test = executable('tracker-steroids-test', 'tracker-test.c', dependencies: [tracker_common_dep, tracker_sparql_dep], - c_args: test_c_args) + c_args: tracker_c_args) test('steroids', steroids_test) |