diff options
| author | Danny 'Guru' Forghieri <daniele.forghieri@gmail.com> | 2017-10-29 17:04:06 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | 4563e35ed38039faa2bc030b24bda7cddd831f71 (patch) | |
| tree | 82dfb7ad7f566bbd037198d4a22c2d915b8c7ba3 /gir | |
| parent | cde3376666b5a125b6a9093268f39399d9566488 (diff) | |
| download | gobject-introspection-4563e35ed38039faa2bc030b24bda7cddd831f71.tar.gz | |
meson: Fix include dir for gir and typelib gen
Both the source and the build dir are needed because some files are
read from the source and others are read after they are built.
Signed-off-by: Nirbheek Chauhan <nirbheek@centricular.com>
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gir/meson.build b/gir/meson.build index ff812846..8b6a3d74 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -43,6 +43,8 @@ scanner_command = [ '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', + '--add-include-path', join_paths(meson.current_build_dir()), + '--add-include-path', join_paths(meson.current_source_dir()), ] # Take a glob and print to newlines @@ -359,7 +361,10 @@ foreach gir : gir_files custom_target('generate-typelib-@0@'.format(gir).underscorify(), input: gir, output: '@BASENAME@.typelib', - command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@'], + command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', + '--includedir', meson.current_build_dir(), + '--includedir', meson.current_source_dir(), + ], install: true, install_dir: typelibdir, ) |