From 0c4dd81c4db228492a483b9aade3450d0ed408e2 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Mon, 21 Jun 2021 15:50:38 +0200 Subject: fix: Handling BothLibraries objects (fixes #8907) --- mesonbuild/modules/gnome.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules/gnome.py') 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 \ -- cgit v1.1