From 4563e35ed38039faa2bc030b24bda7cddd831f71 Mon Sep 17 00:00:00 2001 From: Danny 'Guru' Forghieri Date: Sun, 29 Oct 2017 17:04:06 +0100 Subject: 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 --- gir/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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, ) -- cgit v1.2.1