aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/vs2010backend.py
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-05-26 13:08:33 +0200
committerNicolas Schneider <nioncode+git@gmail.com>2016-05-26 13:08:33 +0200
commita29d9c2c332bcf6147a6a87eeab408bc43fcd30b (patch)
tree51820af113b1c7070bb1b45f537ebe6abf05e7c5 /mesonbuild/backend/vs2010backend.py
parent7aa24c7d0a68959e4d29c41d157ee30ff97153ad (diff)
downloadmeson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.zip
meson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.tar.gz
meson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.tar.bz2
vs: fix generators that use indexed output replacements (like @OUTPUT0@)
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r--mesonbuild/backend/vs2010backend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 82d0dc9..355798d 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -96,11 +96,12 @@ class Vs2010Backend(backends.Backend):
sole_output = ''
curfile = infilelist[i]
infilename = os.path.join(self.environment.get_source_dir(), curfile)
- outfiles = genlist.get_outputs_for(curfile)
- outfiles = [os.path.join(target_private_dir, of) for of in outfiles]
+ outfiles_rel = genlist.get_outputs_for(curfile)
+ outfiles = [os.path.join(target_private_dir, of) for of in outfiles_rel]
generator_output_files += outfiles
args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\
for x in base_args]
+ args = self.replace_outputs(args, target_private_dir, outfiles_rel)
args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", target_private_dir)
for x in args]
fullcmd = exe_arr + self.replace_extra_args(args, genlist)