diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-06-23 00:54:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 00:54:58 +0300 |
| commit | 0e5f88baf4d08c98a8d140829dbe3f7db626ca8a (patch) | |
| tree | bdfbefdcd3d73d605efa9045594c35824a3eece2 /mesonbuild/modules/gnome.py | |
| parent | 39f25ec6aa24b84cb787fc652de019b9292e32aa (diff) | |
| parent | c4b8e0389576202129236ba725551938764844cd (diff) | |
| download | meson-0e5f88baf4d08c98a8d140829dbe3f7db626ca8a.zip meson-0e5f88baf4d08c98a8d140829dbe3f7db626ca8a.tar.gz meson-0e5f88baf4d08c98a8d140829dbe3f7db626ca8a.tar.bz2 | |
Merge pull request #8912 from mensinda/fixBothLibraries
Fix `BothLibraries` processing
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 \ |