diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-08-12 19:02:50 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-31 22:15:15 +0300 |
| commit | 7fb1973caca249e284ba6bec7e7a7b2439f9721f (patch) | |
| tree | 61617aee371f64102dea3bb8b9c64cf2e028c40b | |
| parent | ae3ea22479781dce4bd0e66d9d66ce216fbfed1b (diff) | |
| download | meson-7fb1973caca249e284ba6bec7e7a7b2439f9721f.zip meson-7fb1973caca249e284ba6bec7e7a7b2439f9721f.tar.gz meson-7fb1973caca249e284ba6bec7e7a7b2439f9721f.tar.bz2 | |
Use include-uninstalled for internal gir deps.
This stops g-ir-scanner from trying to search for the pkg-config file
for an internal gir, which won't be available.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/mesongir/meson.build | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index fd05d13..3f1b016 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -486,7 +486,7 @@ class GnomeModule(ExtensionModule): inc.get_subdir()), ] scan_command += [ - "--include=%s" % (inc.get_basename()[:-4], ), + "--include-uninstalled=%s" % (os.path.join(inc.get_subdir(), inc.get_basename()), ) ] depends += [inc] else: diff --git a/test cases/frameworks/12 multiple gir/mesongir/meson.build b/test cases/frameworks/12 multiple gir/mesongir/meson.build index 4775fea..3ca4333 100644 --- a/test cases/frameworks/12 multiple gir/mesongir/meson.build +++ b/test cases/frameworks/12 multiple gir/mesongir/meson.build @@ -23,6 +23,7 @@ girtarget = gnome.generate_gir( symbol_prefix : 'meson_', identifier_prefix : 'Meson', includes : ['GObject-2.0'], + export_packages : 'meson', install : true ) meson_gir = girtarget[0] |