From 2761f96fe9af373136b932907304d3e19313fc3b Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Mon, 14 Mar 2016 09:56:42 +0100 Subject: [PATCH] vs2010: give each target an own temp dir The 'Rebuild' target fails in mysterious ways if multiple targets use the same directories because of output files being deleted between two build steps (e.g. test case 78 fails on Rebuild, whereas Clean + Build work just fine). --- mesonbuild/backend/vs2010backend.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 30c3c9d5e..a72681bf2 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