diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-25 21:14:27 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-26 12:49:35 +0200 |
commit | 8f7343831bb78e6801c93cd45e4edfeed65bc437 (patch) | |
tree | e90a37ac9b27584b8c43a32779330705973def02 /mesonbuild/modules/gnome.py | |
parent | b95d6e319f18389c3a11408481335955bdff4e36 (diff) | |
download | meson-8f7343831bb78e6801c93cd45e4edfeed65bc437.zip meson-8f7343831bb78e6801c93cd45e4edfeed65bc437.tar.gz meson-8f7343831bb78e6801c93cd45e4edfeed65bc437.tar.bz2 |
refactor: Refactor BothLibraries logic
This commit introduces a new type of `HoldableObject`: The
`SecondLevelHolder`. The primary purpose of this class is
to handle cases where two (or more) `HoldableObject`s are
stored at the same time (with one default object). The
best (and currently only) example here is the `BothLibraries`
class.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
-rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index a8f0cc5..efd1f00 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -494,8 +494,6 @@ 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(f'Gir target must be an executable or library but is "{girtarget}" of type {type(girtarget).__name__}') |