diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2016-08-30 21:46:57 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2016-09-14 16:57:40 -0400 |
| commit | 68a2e5c9c905ee4415efa9f8801330fcc5c49e3b (patch) | |
| tree | 32c344d3934148cc0d7ff63927ba7b56cd91e17f | |
| parent | 9009f8267edc5bd48e845bc8469fff6b3b3b106e (diff) | |
| download | meson-68a2e5c9c905ee4415efa9f8801330fcc5c49e3b.zip meson-68a2e5c9c905ee4415efa9f8801330fcc5c49e3b.tar.gz meson-68a2e5c9c905ee4415efa9f8801330fcc5c49e3b.tar.bz2 | |
Also add GIR include_directories to header search path.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 3 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/gir/meson.build | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index ebee196..f82c5c5 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -262,9 +262,10 @@ class GnomeModule: if not isinstance(inc_dirs, list): inc_dirs = [inc_dirs] for incd in inc_dirs: - if not isinstance(incd.held_object, build.IncludeDirs): + if not isinstance(incd.held_object, (str, build.IncludeDirs)): raise MesonException( 'Gir include dirs should be include_directories().') + scan_command += self.get_include_args(state, inc_dirs) scan_command += self.get_include_args(state, gir_inc_dirs + inc_dirs, prefix='--add-include-path=') diff --git a/test cases/frameworks/12 multiple gir/gir/meson.build b/test cases/frameworks/12 multiple gir/gir/meson.build index 40ab9c1..6001a09 100644 --- a/test cases/frameworks/12 multiple gir/gir/meson.build +++ b/test cases/frameworks/12 multiple gir/gir/meson.build @@ -17,7 +17,6 @@ girexe = executable( gnome.generate_gir( girsubproject, sources : libsources, - include_directories : girlib_inc, nsversion : '1.0', namespace : 'MesonSub', symbol_prefix : 'meson_sub_', |