diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-02 02:44:42 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-05 15:57:57 +0000 |
| commit | 9b314c9c24b52ecdda81510ad7a7f0e3914895d0 (patch) | |
| tree | 5e2743071456796b9637668a35c6c10b19563f2a | |
| parent | dff1d8eccf3130ec0925f85c9204ac991d799962 (diff) | |
| download | meson-9b314c9c24b52ecdda81510ad7a7f0e3914895d0.zip meson-9b314c9c24b52ecdda81510ad7a7f0e3914895d0.tar.gz meson-9b314c9c24b52ecdda81510ad7a7f0e3914895d0.tar.bz2 | |
FeatureNew: add two features that were just merged
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 3 |
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) |