diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 15:20:58 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 20:50:47 +0530 |
| commit | afca987e94d89c8677d631bef4055e683e831011 (patch) | |
| tree | 9484e657c9fe1c5724a985542ef0cfe95d5d46b4 /mesonbuild/backend | |
| parent | 253536475171d845b5911e003ec7179893c5bf9b (diff) | |
| download | meson-afca987e94d89c8677d631bef4055e683e831011.zip meson-afca987e94d89c8677d631bef4055e683e831011.tar.gz meson-afca987e94d89c8677d631bef4055e683e831011.tar.bz2 | |
vs: Fix usage of mesonlib.File.rel_to_builddir with generated files
It should always be passed build_to_src otherwise the path for generated
files will always be wrong. Passing the vcxproj path as the build_to_src
only works for files in the source tree.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index c347f4c..e6a42c7 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -735,7 +735,7 @@ class Vs2010Backend(backends.Backend): ET.SubElement(link, 'ImportLibrary').text = target.get_import_filename() # Add module definitions file, if provided if target.vs_module_defs: - relpath = target.vs_module_defs.rel_to_builddir(proj_to_src_root) + relpath = os.path.join(down, target.vs_module_defs.rel_to_builddir(self.build_to_src)) ET.SubElement(link, 'ModuleDefinitionFile').text = relpath if '/ZI' in buildtype_args or '/Zi' in buildtype_args: pdb = ET.SubElement(link, 'ProgramDataBaseFileName') @@ -749,7 +749,7 @@ class Vs2010Backend(backends.Backend): if len(headers) + len(gen_hdrs) + len(extra_files) > 0: inc_hdrs = ET.SubElement(root, 'ItemGroup') for h in headers: - relpath = h.rel_to_builddir(proj_to_src_root) + relpath = os.path.join(down, h.rel_to_builddir(self.build_to_src)) ET.SubElement(inc_hdrs, 'CLInclude', Include=relpath) for h in gen_hdrs: ET.SubElement(inc_hdrs, 'CLInclude', Include=h) @@ -760,7 +760,7 @@ class Vs2010Backend(backends.Backend): if len(sources) + len(gen_src) + len(pch_sources) > 0: inc_src = ET.SubElement(root, 'ItemGroup') for s in sources: - relpath = s.rel_to_builddir(proj_to_src_root) + relpath = os.path.join(down, s.rel_to_builddir(self.build_to_src)) inc_cl = ET.SubElement(inc_src, 'CLCompile', Include=relpath) self.add_pch(inc_cl, proj_to_src_dir, pch_sources, s) self.add_additional_options(s, inc_cl, extra_args, additional_options_set) @@ -788,7 +788,7 @@ class Vs2010Backend(backends.Backend): if self.has_objects(objects, additional_objects, gen_objs): inc_objs = ET.SubElement(root, 'ItemGroup') for s in objects: - relpath = s.rel_to_builddir(proj_to_src_root) + relpath = os.path.join(down, s.rel_to_builddir(self.build_to_src)) ET.SubElement(inc_objs, 'Object', Include=relpath) for s in additional_objects: ET.SubElement(inc_objs, 'Object', Include=s) |