[tracker-miners/wip/carlosg/shuffle-libtracker-miner: 52/116] meson: Install generated headers without needing a script
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/shuffle-libtracker-miner: 52/116] meson: Install generated headers without needing a script
- Date: Thu, 12 Dec 2019 10:25:16 +0000 (UTC)
commit d8e6b5bee63fc8c90ea394f702d9ef492e3d8519
Author: Sam Thursfield <sam afuera me uk>
Date: Sun Apr 22 23:23:04 2018 +0200
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-miner/meson.build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
index d08e07710..a6224f2ab 100644
--- a/src/libtracker-miner/meson.build
+++ b/src/libtracker-miner/meson.build
@@ -6,6 +6,8 @@ miner_enums = gnome.mkenums('tracker-miner-enum-types',
sources: 'tracker-miner-enums.h',
c_template: 'tracker-miner-enum-types.c.template',
h_template: 'tracker-miner-enum-types.h.template',
+ install_header: true,
+ install_dir: join_paths(get_option('includedir'), 'tracker-@0@'.format(tracker_api_version),
'libtracker-miner'),
)
private_sources = [
@@ -97,8 +99,3 @@ configure_file(
install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
install_headers(miner_headers, subdir: 'tracker-@0@/libtracker-miner'.format(tracker_api_version))
-
-# Work around https://github.com/mesonbuild/meson/issues/705
-meson.add_install_script('../install-generated-header.sh',
- join_paths(meson.current_build_dir(), 'tracker-miner-enum-types.h'),
- join_paths(get_option('prefix'), get_option('includedir'), 'tracker-@0@'.format(tracker_api_version),
'libtracker-miner'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]