[gobject-introspection/wip/meson: 14/23] meson: Fix include dir for gir and typelib gen

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 4df57c1620f23c2c50cfffdbd05b97e18a859961
Author: Danny 'Guru' Forghieri <daniele forghieri gmail com>
Date:   Sun Oct 29 17:04:06 2017 +0100

    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.

 gir/meson.build |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gir/meson.build b/gir/meson.build
index ff81284..8b6a3d7 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,
   )