Merge pull request #7059 from xclaesse/gir-windows

Fix gir on Windows

2 files changed, 10 insertions, 2 deletions

diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index c0ec089..95a3956 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -1800,6 +1800,10 @@ class ExternalProgram:
         self.name = name
         if command is not None:
             self.command = listify(command)
+            if mesonlib.is_windows():
+                cmd = self.command[0]
+                args = self.command[1:]
+                self.command = self._search_windows_special_cases(name, cmd) + args
         else:
             all_search_dirs = [search_dir]
             if extra_search_dirs:
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 14cb4c4..7629f18 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -732,8 +732,12 @@ class GnomeModule(ExtensionModule):
 
         gir_dep, giscanner, gicompiler = self._get_gir_dep(state)
 
-        ns = kwargs.pop('namespace')
-        nsversion = kwargs.pop('nsversion')
+        ns = kwargs.get('namespace')
+        if not ns:
+            raise MesonException('Missing "namespace" keyword argument')
+        nsversion = kwargs.get('nsversion')
+        if not nsversion:
+            raise MesonException('Missing "nsversion" keyword argument')
         libsources = mesonlib.extract_as_list(kwargs, 'sources', pop=True)
         girfile = '%s-%s.gir' % (ns, nsversion)
         srcdir = os.path.join(state.environment.get_source_dir(), state.subdir)