diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-23 12:44:13 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-26 23:10:07 +0300 |
| commit | 8a7ac6ba4c26ace86d9291b5d937dedc9e7c7491 (patch) | |
| tree | b3697a19e5336dc4e8eae7dcf6914f5ef4d87bb3 /mesonbuild | |
| parent | 6946029d16bd32799b4a377ee357d1fc1c6cf536 (diff) | |
| download | meson-8a7ac6ba4c26ace86d9291b5d937dedc9e7c7491.zip meson-8a7ac6ba4c26ace86d9291b5d937dedc9e7c7491.tar.gz meson-8a7ac6ba4c26ace86d9291b5d937dedc9e7c7491.tar.bz2 | |
vs: Fix custom target generated object paths
The paths are already relative to the target dir.
Includes a test for this which generates and builds in subdirs. If all
the generation and usage is done in the build root, this bug will
obviously not be triggered.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 929fa93..84e8296 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -918,7 +918,7 @@ class Vs2010Backend(backends.Backend): assert(isinstance(o, str)) additional_objects.append(o) for o in custom_objs: - additional_objects.append(self.relpath(o, self.get_target_dir(target))) + additional_objects.append(o) if len(additional_links) > 0: additional_links.append('%(AdditionalDependencies)') ET.SubElement(link, 'AdditionalDependencies').text = ';'.join(additional_links) |