aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-14 19:29:16 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-14 19:29:16 +0200
commitcefbea48169a60039c6b1ad1512d627b60ad070c (patch)
tree204de4569daa92429988ca211e54ed042386db5e
parent246d9f4564bb33e4404cc438932c206378b4b277 (diff)
parent2761f96fe9af373136b932907304d3e19313fc3b (diff)
downloadmeson-cefbea48169a60039c6b1ad1512d627b60ad070c.zip
meson-cefbea48169a60039c6b1ad1512d627b60ad070c.tar.gz
meson-cefbea48169a60039c6b1ad1512d627b60ad070c.tar.bz2
Merge pull request #447 from nioncode/vs-fix-dirs
vs2010: give each target an own temp dir
-rw-r--r--mesonbuild/backend/vs2010backend.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 30c3c9d..a72681b 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -272,7 +272,7 @@ class Vs2010Backend(backends.Backend):
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
- intdir.text = 'test-temp\\'
+ intdir.text = target.get_id() + '\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = target.name
return root
@@ -395,7 +395,7 @@ class Vs2010Backend(backends.Backend):
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
- intdir.text = os.path.join(self.get_target_dir(target), target.get_basename() + '.dir') + '\\'
+ intdir.text = target.get_id() + '\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = target_name
inclinc = ET.SubElement(direlem, 'LinkIncremental')
@@ -604,7 +604,7 @@ class Vs2010Backend(backends.Backend):
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
- intdir.text = 'test-temp\\'
+ intdir.text = 'regen-temp\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = project_name