diff options
| -rw-r--r-- | docs/markdown/Adding-new-projects-to-wrapdb.md | 5 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md index 4420de5..58b27ba 100644 --- a/docs/markdown/Adding-new-projects-to-wrapdb.md +++ b/docs/markdown/Adding-new-projects-to-wrapdb.md @@ -37,11 +37,10 @@ Each project gets its own repo. It is initialized like this: git init git add readme.txt - git commit -a -m 'Start of project foobar.' - git tag commit_zero -a -m 'A tag that helps get revision ids for releases.' + git add LICENSE.build + git commit -a -m 'Create project foobar' git remote add origin <repo url> git push -u origin master - git push --tags Note that this is the *only* commit that will ever be made to master branch. All other commits are done to branches. diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 5e972f2..e9a3519 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -946,7 +946,8 @@ class Vs2010Backend(backends.Backend): self.add_project_reference(root, tvcxproj, tid) else: # Other libraries go into AdditionalDependencies - additional_links.append(linkname) + if linkname not in additional_links: + additional_links.append(linkname) for lib in self.get_custom_target_provided_libraries(target): additional_links.append(self.relpath(lib, self.get_target_dir(target))) additional_objects = [] diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index acb86f0..b04d586 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1579,14 +1579,14 @@ class Interpreter(InterpreterBase): 'run_command': self.func_run_command, 'set_variable': self.func_set_variable, 'subdir': self.func_subdir, + 'subdir_done': self.func_subdir_done, 'subproject': self.func_subproject, 'shared_library': self.func_shared_lib, 'shared_module': self.func_shared_module, 'static_library': self.func_static_lib, 'both_libraries': self.func_both_lib, 'test': self.func_test, - 'vcs_tag': self.func_vcs_tag, - 'subdir_done': self.func_subdir_done, + 'vcs_tag': self.func_vcs_tag }) if 'MESON_UNIT_TEST' in os.environ: self.funcs.update({'exception': self.func_exception}) |