summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-09-28 18:04:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-09-28 18:04:48 (GMT)
commit3398ec7d6f5bb6d25edbbd079df7058819c8d60e (patch)
treefb224d07a118bfa59a8b6d0267c84880a03b2123 /Source
parente66c12a2659df4fe74a199fb805969581676b36a (diff)
parent7ef659fcc3db3d11190526101f123992728794e0 (diff)
downloadCMake-3398ec7d6f5bb6d25edbbd079df7058819c8d60e.zip
CMake-3398ec7d6f5bb6d25edbbd079df7058819c8d60e.tar.gz
CMake-3398ec7d6f5bb6d25edbbd079df7058819c8d60e.tar.bz2
Merge topic 'vs10-object-intdir'
7ef659f VS10: Use $(IntDir) for per-source output directory (#11270)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b290aed..8dfafff 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -767,7 +767,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
hasFlags = true;
this->WriteString("<ObjectFileName>", 3);
(*this->BuildFileStream )
- << "$(Configuration)/" << objectName << "</ObjectFileName>\n";
+ << "$(IntDir)/" << objectName << "</ObjectFileName>\n";
}
std::vector<std::string> *configs =
static_cast<cmGlobalVisualStudio7Generator *>