diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-31 23:25:21 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-01 00:25:21 +0200 |
| commit | e1a83793ae986db44bc810c36a8ea8090d81fe3f (patch) | |
| tree | 56706c7f19a38b36f609f5ba6fa318f60c7acc1d /mesonbuild/interpreter.py | |
| parent | abad2ff0056f1100425426094165691386477d11 (diff) | |
| download | meson-e1a83793ae986db44bc810c36a8ea8090d81fe3f.zip meson-e1a83793ae986db44bc810c36a8ea8090d81fe3f.tar.gz meson-e1a83793ae986db44bc810c36a8ea8090d81fe3f.tar.bz2 | |
CMake: Added support for CMAKE_MODULE_PATH and extra CMake args (closes #4779)
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0b9ce71..fb4c468 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1929,6 +1929,7 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'main', 'method', 'modules', + 'cmake_module_path', 'optional_modules', 'native', 'not_found_message', @@ -1936,6 +1937,7 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'static', 'version', 'private_headers', + 'cmake_args', }, 'declare_dependency': {'include_directories', 'link_with', @@ -2903,10 +2905,10 @@ external dependencies (including libraries) must go to "dependencies".''') elif name == 'openmp': FeatureNew('OpenMP Dependency', '0.46.0').use(self.subproject) + @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message', 'cmake_module_path', 'cmake_args']) @FeatureNewKwargs('dependency', '0.49.0', ['disabler']) @FeatureNewKwargs('dependency', '0.40.0', ['method']) @FeatureNewKwargs('dependency', '0.38.0', ['default_options']) - @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message']) @disablerIfNotFound @permittedKwargs(permitted_kwargs['dependency']) def func_dependency(self, node, args, kwargs): |