Merge topic 'vs10-object-intdir'

7ef659f VS10: Use $(IntDir) for per-source output directory (#11270)
This commit is contained in:
Brad King 2010-09-28 14:04:48 -04:00 committed by CMake Topic Stage
commit 3398ec7d6f

View File

@ -767,7 +767,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
hasFlags = true; hasFlags = true;
this->WriteString("<ObjectFileName>", 3); this->WriteString("<ObjectFileName>", 3);
(*this->BuildFileStream ) (*this->BuildFileStream )
<< "$(Configuration)/" << objectName << "</ObjectFileName>\n"; << "$(IntDir)/" << objectName << "</ObjectFileName>\n";
} }
std::vector<std::string> *configs = std::vector<std::string> *configs =
static_cast<cmGlobalVisualStudio7Generator *> static_cast<cmGlobalVisualStudio7Generator *>