diff options
| author | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-29 01:48:39 +0200 |
|---|---|---|
| committer | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-29 12:08:34 +0200 |
| commit | c2a9f81b68ce5d5370a6eff5df1fa678fc59fb17 (patch) | |
| tree | c3f157a06691ccc1a0f1058890a4d9410be875a2 /mesonbuild/backend | |
| parent | ba8b650cdaf926fc183ae6fa4d1348996b07fb6c (diff) | |
| download | meson-c2a9f81b68ce5d5370a6eff5df1fa678fc59fb17.zip meson-c2a9f81b68ce5d5370a6eff5df1fa678fc59fb17.tar.gz meson-c2a9f81b68ce5d5370a6eff5df1fa678fc59fb17.tar.bz2 | |
vs2010: fix generated files' path
Generated files should always come with the correct relative path set,
so we don't have to modify it at all.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index eb56788..c81e44b 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -552,11 +552,7 @@ class Vs2010Backend(backends.Backend): relpath = h.rel_to_builddir(proj_to_src_root) ET.SubElement(inc_hdrs, 'CLInclude', Include=relpath) for h in gen_hdrs: - if isinstance(h, str): - relpath = h - else: - relpath = h.rel_to_builddir(proj_to_src_root) - ET.SubElement(inc_hdrs, 'CLInclude', Include = relpath) + ET.SubElement(inc_hdrs, 'CLInclude', Include=h) if len(sources) + len(gen_src) + len(pch_sources) > 0: inc_src = ET.SubElement(root, 'ItemGroup') for s in sources: @@ -565,8 +561,7 @@ class Vs2010Backend(backends.Backend): self.add_pch(inc_cl, proj_to_src_dir, pch_sources, s) self.add_additional_options(s, inc_cl, extra_args, additional_options_set) for s in gen_src: - relpath = self.relpath(s, target.subdir) - inc_cl = ET.SubElement(inc_src, 'CLCompile', Include=relpath) + inc_cl = ET.SubElement(inc_src, 'CLCompile', Include=s) self.add_pch(inc_cl, proj_to_src_dir, pch_sources, s) self.add_additional_options(s, inc_cl, extra_args, additional_options_set) for lang in pch_sources: |