diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
| commit | 51b67366ed9d8e81567cfff1ede2b34d85410933 (patch) | |
| tree | 11c8bd8376a98c5f78cbe501ad1e20347baf7ccb /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | c7bdef5b48fe74f92d75f538e702257e7de1a998 (diff) | |
| parent | 0996f2a228a834d75ba9845ea6b899b60eb84712 (diff) | |
| download | CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.zip CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.gz CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.bz2 | |
Merge branch 'cleanup-object-file-names' into object-library
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 27b83b9..66f9a36 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -877,9 +877,6 @@ void cmVisualStudio10TargetGenerator::WriteCLSources() void cmVisualStudio10TargetGenerator::ComputeObjectNames() { - // We may be modifying the source groups temporarily, so make a copy. - std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups(); - // get the classes from the source lists then add them to the groups std::vector<cmSourceFile*>const & classes = this->Target->GetSourceFiles(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); @@ -891,13 +888,10 @@ void cmVisualStudio10TargetGenerator::ComputeObjectNames() { this->ModuleDefinitionFile = (*i)->GetFullPath(); } - cmSourceGroup& sourceGroup = - this->Makefile->FindSourceGroup(source.c_str(), sourceGroups); - sourceGroup.AssignSource(*i); } // Compute which sources need unique object computation. - this->LocalGenerator->ComputeObjectNameRequirements(sourceGroups); + this->LocalGenerator->ComputeObjectNameRequirements(classes); } bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( |