diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-19 10:34:00 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:27:04 +0200 |
| commit | 35936316eb87f2930a3873da71eaa1c9f11e3186 (patch) | |
| tree | 4d47ec683062592784fa1cbc32ad6d127b0d4456 /mesonbuild | |
| parent | 9b22147dcb0c31cc374ebf6b059f225530401a51 (diff) | |
| download | meson-35936316eb87f2930a3873da71eaa1c9f11e3186.zip meson-35936316eb87f2930a3873da71eaa1c9f11e3186.tar.gz meson-35936316eb87f2930a3873da71eaa1c9f11e3186.tar.bz2 | |
cmake: rebase fixes
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 5 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index da14a06..488c99c 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -34,6 +34,7 @@ backend_generator_map = { 'vs2010': 'Visual Studio 10 2010', 'vs2015': 'Visual Studio 15 2017', 'vs2017': 'Visual Studio 15 2017', + 'vs2019': 'Visual Studio 16 2019', } language_map = { @@ -430,7 +431,7 @@ class CMakeInterpreter: if not isinstance(elements, list): elements = [args] args.arguments += [nodeify(x) for x in elements] - return ArrayNode(args, 0, 0) + return ArrayNode(args, 0, 0, 0, 0) def function(name: str, args=[], kwargs={}) -> FunctionNode: args_n = ArgumentNode(token()) @@ -438,7 +439,7 @@ class CMakeInterpreter: args = [args] args_n.arguments = [nodeify(x) for x in args] args_n.kwargs = {k: nodeify(v) for k, v in kwargs.items()} - func_n = FunctionNode(self.subdir, 0, 0, name, args_n) + func_n = FunctionNode(self.subdir, 0, 0, 0, 0, name, args_n) return func_n def method(obj: BaseNode, name: str, args=[], kwargs={}) -> MethodNode: diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index efed755..0e50202 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2416,7 +2416,7 @@ external dependencies (including libraries) must go to "dependencies".''') raise InterpreterException('Tried to call option() in build description file. All options must be in the option file.') @FeatureNewKwargs('subproject', '0.38.0', ['default_options']) - @FeatureNewKwargs('subproject', '0.50.0', ['method']) + @FeatureNewKwargs('subproject', '0.51.0', ['method', 'cmake_options']) @permittedKwargs(permitted_kwargs['subproject']) @stringArgs def func_subproject(self, nodes, args, kwargs): @@ -2537,9 +2537,9 @@ external dependencies (including libraries) must go to "dependencies".''') self.subprojects[dirname] = SubprojectHolder(subi, self.subproject_dir, dirname) # Duplicates are possible when subproject uses files from project root if build_def_files: - self.build_def_files += list(set(self.build_def_files + build_def_files)) + self.build_def_files = list(set(self.build_def_files + build_def_files)) else: - self.build_def_files += list(set(self.build_def_files + subi.build_def_files)) + self.build_def_files = list(set(self.build_def_files + subi.build_def_files)) self.build.merge(subi.build) self.build.subprojects[dirname] = subi.project_version return self.subprojects[dirname] |