diff options
| author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2018-11-05 14:54:29 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-11-05 21:33:07 -0500 |
| commit | 9da0c6af9884371b7e685d8ff5af1c9c2f4208c6 (patch) | |
| tree | f57a59144a22fdb644cbd4834898c84f6f2943a8 | |
| parent | a562b08ae1f3d36a45a83f6690cadf594e285d65 (diff) | |
| download | meson-9da0c6af9884371b7e685d8ff5af1c9c2f4208c6.zip meson-9da0c6af9884371b7e685d8ff5af1c9c2f4208c6.tar.gz meson-9da0c6af9884371b7e685d8ff5af1c9c2f4208c6.tar.bz2 | |
gnome: GIR works fine for static libraries
g-ir-scanner works as well with static libraries as with dynamic
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 46df53e..ae86146 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -411,8 +411,10 @@ class GnomeModule(ExtensionModule): def _unwrap_gir_target(self, girtarget): while hasattr(girtarget, 'held_object'): girtarget = girtarget.held_object - if not isinstance(girtarget, (build.Executable, build.SharedLibrary)): - raise MesonException('Gir target must be an executable or shared library') + if not isinstance(girtarget, (build.Executable, build.SharedLibrary, + build.StaticLibrary)): + raise MesonException('Gir target must be an executable or library') + return girtarget def _get_gir_dep(self, state): @@ -537,7 +539,7 @@ class GnomeModule(ExtensionModule): for girtarget in girtargets: if isinstance(girtarget, build.Executable): ret += ['--program', girtarget] - elif isinstance(girtarget, build.SharedLibrary): + else: libname = girtarget.get_basename() # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 |