diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2017-07-19 13:08:15 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2017-07-19 14:19:43 +0200 |
| commit | e10fbf332b809cb479e6237455b00bfcbd14a7ed (patch) | |
| tree | 79e6aa8234244cb96ca7e9f9863db387f4822409 /src/libtracker-sparql | |
| parent | 2957dd7df553bac3bc3820672b2ced398a33118d (diff) | |
| download | tracker-e10fbf332b809cb479e6237455b00bfcbd14a7ed.tar.gz | |
build: Unbreak meson build
The change in 1b31260292 added somewhat clumsy meson support. The
C-side vapi is now required by the Vala-side vapi, but only the latter
is included when building the rest of the libraries. Since we can't
tell the build to ditch the vala vapi and include our merged/spiced up
tracker-sparql-2.0.vapi file, add a dependency on the C vapi that we can
add on the selected places.
A side effect of including the unfixed vapis is that includes point
to internal files, so make sure everything gets TRACKER_COMPILATION
when building to circumvent it.
Diffstat (limited to 'src/libtracker-sparql')
| -rw-r--r-- | src/libtracker-sparql/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build index a326c2e5c..b4af625bb 100644 --- a/src/libtracker-sparql/meson.build +++ b/src/libtracker-sparql/meson.build @@ -11,6 +11,7 @@ tracker_sparql_intermediate_dependencies = [uuid] # First build the Vala parts ... libtracker_sparql_c_vapi = files('libtracker-sparql-intermediate-c.vapi') +libtracker_sparql_c_vapi_dep = meson.get_compiler('vala').find_library('libtracker-sparql-intermediate-c', dirs: meson.current_source_dir()) libtracker_sparql_intermediate_vala = static_library('tracker-sparql-intermediate-vala', 'tracker-namespace.vala', @@ -81,7 +82,7 @@ tracker_sparql_intermediate_dep = declare_dependency( link_with: [libtracker_sparql_intermediate_c, libtracker_sparql_intermediate_vala], sources: tracker_sparql_generated_header, include_directories: [srcinc, include_directories('.')], - dependencies: tracker_sparql_intermediate_dependencies + dependencies: [ tracker_sparql_intermediate_dependencies, libtracker_sparql_c_vapi_dep ], ) configure_file( |