diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-21 15:50:38 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-22 21:09:19 +0200 |
| commit | 0c4dd81c4db228492a483b9aade3450d0ed408e2 (patch) | |
| tree | 58f2f9cb2565f6c35d7cc622cab690fbab13c42d /mesonbuild/modules/gnome.py | |
| parent | 7588dbc587afd3de931be60472f8919ae17dd396 (diff) | |
| download | meson-0c4dd81c4db228492a483b9aade3450d0ed408e2.zip meson-0c4dd81c4db228492a483b9aade3450d0ed408e2.tar.gz meson-0c4dd81c4db228492a483b9aade3450d0ed408e2.tar.bz2 | |
fix: Handling BothLibraries objects (fixes #8907)
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0ae1c70..51f2e6e 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -480,9 +480,11 @@ class GnomeModule(ExtensionModule): return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes def _unwrap_gir_target(self, girtarget, state): + if isinstance(girtarget, build.BothLibraries): + girtarget = girtarget.get_preferred_library() if not isinstance(girtarget, (build.Executable, build.SharedLibrary, build.StaticLibrary)): - raise MesonException('Gir target must be an executable or library') + raise MesonException(f'Gir target must be an executable or library but is "{girtarget}" of type {type(girtarget).__name__}') STATIC_BUILD_REQUIRED_VERSION = ">=1.58.1" if isinstance(girtarget, (build.StaticLibrary)) and \ |