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 /src/libtracker-common | |
| 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 'src/libtracker-common')
| -rw-r--r-- | src/libtracker-common/meson.build | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build index 8ab4af5c3..ddf098177 100644 --- a/src/libtracker-common/meson.build +++ b/src/libtracker-common/meson.build @@ -6,13 +6,13 @@ enums = gnome.mkenums('tracker-enum-types', h_template: 'tracker-enum-types.h.template', ) -tracker_common_enum_header = enums[1] - -parser_sha1_header = configure_file( +tracker_common_parser_sha1_header = configure_file( input: 'tracker-parser-sha1.h.in', output: 'tracker-parser-sha1.h', command: ['generate-tracker-parser-sha1-header.sh']) +tracker_common_enum_header = enums[1] + tracker_common_sources = [ 'tracker-date-time.c', 'tracker-dbus.c', @@ -27,7 +27,7 @@ tracker_common_sources = [ 'tracker-language.c', 'tracker-seccomp.c', enums[0], enums[1], - parser_sha1_header, + tracker_common_parser_sha1_header, ] if unicode_library_name == 'icu' @@ -42,9 +42,7 @@ tracker_common_dependencies = [glib, gio, gio_unix, libmath] libtracker_common = library('tracker-common', tracker_common_sources, dependencies: tracker_common_dependencies + [unicode_library], - c_args: [ - '-DTRACKER_COMPILATION', - ], + c_args: tracker_c_args, include_directories: [configinc, srcinc], install: true, install_dir: tracker_internal_libs_dir, @@ -62,7 +60,7 @@ commoninc = include_directories('.') # # Upstream issue: https://github.com/mesonbuild/meson/issues/671 tracker_common_dep = declare_dependency( - sources: enums[1], + sources: [tracker_common_enum_header, tracker_common_parser_sha1_header], link_with: libtracker_common, dependencies: tracker_common_dependencies, include_directories: [configinc, srcinc, commoninc], |