diff options
| author | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-14 09:56:42 +0100 |
|---|---|---|
| committer | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-14 09:56:42 +0100 |
| commit | 2761f96fe9af373136b932907304d3e19313fc3b (patch) | |
| tree | 60608c7674cdc0feb5090bafce8856831673c407 | |
| parent | 304c0d2cb5b2a25669cea0ade51e7eadfb33c32b (diff) | |
| download | meson-2761f96fe9af373136b932907304d3e19313fc3b.zip meson-2761f96fe9af373136b932907304d3e19313fc3b.tar.gz meson-2761f96fe9af373136b932907304d3e19313fc3b.tar.bz2 | |
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).
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 6 |
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 |