diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-09-29 21:27:05 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-10-03 10:06:04 +0200 |
commit | 73d52266b5cf8e6b62d715328f0c66b1734c3026 (patch) | |
tree | b8e0b6cbc1d9c378c802c235fdbb2713cbee7a7c /mesonbuild/interpreter.py | |
parent | e5c720ff607cdf3101de031ff3a36f434d77b0d1 (diff) | |
download | meson-73d52266b5cf8e6b62d715328f0c66b1734c3026.zip meson-73d52266b5cf8e6b62d715328f0c66b1734c3026.tar.gz meson-73d52266b5cf8e6b62d715328f0c66b1734c3026.tar.bz2 |
Use include_type instead of is_system
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index eb0eaf7..eae5a16 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -412,7 +412,7 @@ class DependencyHolder(InterpreterObject, ObjectHolder): 'get_configtool_variable': self.configtool_method, 'get_variable': self.variable_method, 'partial_dependency': self.partial_dependency_method, - 'is_system': self.is_system_method, + 'include_type': self.include_type_method, 'as_system': self.as_system_method, }) @@ -475,22 +475,20 @@ class DependencyHolder(InterpreterObject, ObjectHolder): def variable_method(self, args, kwargs): return self.held_object.get_variable(**kwargs) - @FeatureNew('dep.is_system', '0.52.0') + @FeatureNew('dep.include_type', '0.52.0') @noPosargs @permittedKwargs({}) - def is_system_method(self, args, kwargs): - return self.held_object.get_is_system() + def include_type_method(self, args, kwargs): + return self.held_object.get_include_type() @FeatureNew('dep.as_system', '0.52.0') @permittedKwargs({}) def as_system_method(self, args, kwargs): args = listify(args) - new_is_system = True + new_is_system = 'system' if len(args) > 1: raise InterpreterException('as_system takes only one optional value') if len(args) == 1: - if not isinstance(args[0], bool): - raise InterpreterException('as_system takes only a boolean value') new_is_system = args[0] new_dep = self.held_object.generate_system_dependency(new_is_system) return DependencyHolder(new_dep, self.subproject) @@ -2019,7 +2017,7 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'version', 'private_headers', 'cmake_args', - 'is_system', + 'include_type', }, 'declare_dependency': {'include_directories', 'link_with', @@ -3071,7 +3069,7 @@ external dependencies (including libraries) must go to "dependencies".''') elif name == 'openmp': FeatureNew('OpenMP Dependency', '0.46.0').use(self.subproject) - @FeatureNewKwargs('dependency', '0.52.0', ['is_system']) + @FeatureNewKwargs('dependency', '0.52.0', ['include_type']) @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']) |