aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--mesonbuild/modules/windows.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 181c7b4..17ad65d 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3214,7 +3214,7 @@ root and issuing %s.
self.build.install_dirs.append(idir)
return idir
- @FeatureNewKwargs('configure_file', '0.47.0', ['copy'])
+ @FeatureNewKwargs('configure_file', '0.47.0', ['copy', 'output_format'])
@FeatureNewKwargs('configure_file', '0.46.0', ['format'])
@FeatureNewKwargs('configure_file', '0.41.0', ['capture'])
@permittedKwargs(permitted_kwargs['configure_file'])
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index c6c9a64..fb5bacf 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -20,7 +20,7 @@ from ..mesonlib import MesonException, extract_as_list
from . import get_include_args
from . import ModuleReturnValue
from . import ExtensionModule
-from ..interpreterbase import permittedKwargs
+from ..interpreterbase import permittedKwargs, FeatureNewKwargs
class WindowsModule(ExtensionModule):
@@ -30,6 +30,7 @@ class WindowsModule(ExtensionModule):
return compilers[l]
raise MesonException('Resource compilation requires a C or C++ compiler.')
+ @FeatureNewKwargs('windows.compile_resources', '0.47.0', ['depend_files'])
@permittedKwargs({'args', 'include_directories', 'depend_files'})
def compile_resources(self, state, args, kwargs):
comp = self.detect_compiler(state.compilers)