diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 03:19:10 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 22:32:41 +0530 |
| commit | 711c0cbd674a84fc2d28d0b92dfb62124180d3ef (patch) | |
| tree | 2a28e7131aefff024a97f5113d80d11aece99985 /mesonbuild/backend/vs2010backend.py | |
| parent | cdae69c0f8c5623f9e563c15a50e453530366e3d (diff) | |
| download | meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.zip meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.tar.gz meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.tar.bz2 | |
vs: Fix depend_files support in custom targets
This was totally broken and we didn't notice because we had no tests
for it at all.
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 79ad840..46eab11 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -437,6 +437,7 @@ class Vs2010Backend(backends.Backend): # from the target dir, not the build root. target.absolute_paths = True (srcs, ofilenames, cmd) = self.eval_custom_target_command(target, True) + depend_files = self.get_custom_target_depend_files(target, True) # Always use a wrapper because MSBuild eats random characters when # there are many arguments. tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) @@ -448,7 +449,7 @@ class Vs2010Backend(backends.Backend): '--internal', 'exe', exe_data] ET.SubElement(customstep, 'Command').text = ' '.join(self.quote_arguments(wrapper_cmd)) ET.SubElement(customstep, 'Outputs').text = ';'.join(ofilenames) - ET.SubElement(customstep, 'Inputs').text = ';'.join(srcs) + ET.SubElement(customstep, 'Inputs').text = ';'.join([exe_data] + srcs + depend_files) ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.targets') self.generate_custom_generator_commands(target, root) self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname) |