diff options
| author | Andrea Azzarone <andrea.azzarone@canonical.com> | 2019-02-28 10:53:58 +0000 |
|---|---|---|
| committer | Andrea Azzarone <andrea.azzarone@canonical.com> | 2019-02-28 11:21:03 +0000 |
| commit | c3497c31ed9110c89055bc7abc4556978acd6c7b (patch) | |
| tree | a79e283a86493f5d2dfa0e3b9233ad3696e4d68c | |
| parent | 34437f019cfe7c4c69bc4b48b16e838140ef2db6 (diff) | |
| download | tracker-c3497c31ed9110c89055bc7abc4556978acd6c7b.tar.gz | |
meson: Enforce build order using generated headers directly
Both libtracker-fts and libtracker-data end up requiring includes from
tracker-sparql.h, but we have to generate tracker-generated.h first. To
solve this, commit a452173ed introduced a dependency to an intermediate
target (tracker_sparql_intermediate_dep). Use directly the custom target
tracker_sparql_generated_header to enforce build order.
Closes: https://gitlab.gnome.org/GNOME/tracker/issues/78
| -rw-r--r-- | src/libtracker-data/meson.build | 3 | ||||
| -rw-r--r-- | src/libtracker-fts/meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build index 4b120d593..adc87d4a1 100644 --- a/src/libtracker-data/meson.build +++ b/src/libtracker-data/meson.build @@ -66,6 +66,7 @@ libtracker_data = library('tracker-data', tracker_data_enums[1], tracker_gresources[0], tracker_gresources[1], + tracker_sparql_generated_header, c_args: tracker_c_args, install: true, install_dir: tracker_internal_libs_dir, @@ -76,7 +77,7 @@ libtracker_data = library('tracker-data', # symbols from libtracker-sparql, but does not mean it should # be linked to it. override_options: ['b_lundef=false'], - dependencies: tracker_data_dependencies + [unicode_library, tracker_sparql_intermediate_dep], + dependencies: tracker_data_dependencies + [unicode_library], include_directories: [commoninc, configinc, srcinc], ) diff --git a/src/libtracker-fts/meson.build b/src/libtracker-fts/meson.build index 5e1122243..5e1eab814 100644 --- a/src/libtracker-fts/meson.build +++ b/src/libtracker-fts/meson.build @@ -11,7 +11,8 @@ libtracker_fts = static_library('tracker-fts', 'tracker-fts-config.c', 'tracker-fts-tokenizer.c', libtracker_fts_fts5, - dependencies: [tracker_common_dep, tracker_sparql_intermediate_dep], + tracker_sparql_generated_header, + dependencies: [tracker_common_dep], c_args: tracker_c_args ) |