From 7bcf86e4c3a29c0bae02837174bd3cbb5e09e3c7 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Sun, 22 Apr 2018 23:23:04 +0200 Subject: meson: Install generated headers without needing a script This script dates from a long time ago when Meson lacked ways to install generated headers. This fixes an issue where `ninja install` in tracker.git triggers a rebuild of lots of stuff from tracker-miners.git, which happened because the mtime of the installed generated headers would become newer than the build files in tracker-miners.git and cause ninja to rebuild them all. --- src/libtracker-sparql/meson.build | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/libtracker-sparql') diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build index fc2b9b5a8..fa7d45f72 100644 --- a/src/libtracker-sparql/meson.build +++ b/src/libtracker-sparql/meson.build @@ -50,7 +50,9 @@ tracker_sparql_generated_header = custom_target('tracker-sparql-generated-header # output: 'tracker-generated.h', command: [join_paths(meson.current_source_dir(), 'tracker-sparql-add-include-guards.sh'), join_paths(meson.current_build_dir(), 'tracker-generated-no-checks.h'), '@OUTPUT@'], - depends: libtracker_sparql_intermediate_vala) + depends: libtracker_sparql_intermediate_vala, + install: true, + install_dir: join_paths(get_option('prefix'), get_option('includedir'), 'tracker-@0@'.format(tracker_api_version), 'libtracker-sparql')) # Now build the C parts ... @@ -95,12 +97,6 @@ install_headers( 'tracker-sparql.h', subdir: 'tracker-@0@/libtracker-sparql'.format(tracker_api_version)) -# FIXME: we need a custom script to install generated Vala headers; see -# . -meson.add_install_script('../install-generated-header.sh', - join_paths(meson.current_build_dir(), 'tracker-generated.h'), - join_paths(get_option('prefix'), get_option('includedir'), 'tracker-@0@'.format(tracker_api_version), 'libtracker-sparql')) - # FIXME: we can't depend properly on the generated .vapi to do this. custom_target('tracker-sparql-' + tracker_api_version + '.vapi', #input: 'tracker-sparql-intermediate-vala.vapi', -- cgit v1.2.1