diff options
| author | Adam Duskett <Aduskett@gmail.com> | 2020-02-26 05:51:28 -0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-02-26 11:49:34 -0500 |
| commit | 6ba034c37d8004a72d392f37f66e709c593d8983 (patch) | |
| tree | 68d4c51d9960f38f7e2380c06ffceb43d06d1f49 /mesonbuild | |
| parent | f66b04b0996eae5cd7b0ad007435d5a51f28b691 (diff) | |
| download | meson-6ba034c37d8004a72d392f37f66e709c593d8983.zip meson-6ba034c37d8004a72d392f37f66e709c593d8983.tar.gz meson-6ba034c37d8004a72d392f37f66e709c593d8983.tar.bz2 | |
mesonbuild/modules/gnome.py: Fix giscanner and gicompiler logic
Currently, giscanner and the gicompiler paths are only scanned via pkg-config
if they are first found in the host path.
Add a else statement to fix this oversite.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0ea4b27..1743b59 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -754,12 +754,16 @@ class GnomeModule(ExtensionModule): giscanner_path = giscanner.get_command()[0] if not any(x in giscanner_path for x in gi_util_dirs_check): giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) + else: + giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) gicompiler = self.interpreter.find_program_impl('g-ir-compiler') if gicompiler.found(): gicompiler_path = gicompiler.get_command()[0] if not any(x in gicompiler_path for x in gi_util_dirs_check): gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) + else: + gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) ns = kwargs.pop('namespace') nsversion = kwargs.pop('nsversion') |