diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-06 14:31:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-06 18:30:19 (GMT) |
| commit | 67734be8cf4cb7fa1c29ec62a19ef04dd898a08c (patch) | |
| tree | 83da920648a7c7bf558e87a48f32e2aac318059b /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 4ae7f3656b6ebe7c878716b95ef5eb3d924d4173 (diff) | |
| download | CMake-67734be8cf4cb7fa1c29ec62a19ef04dd898a08c.zip CMake-67734be8cf4cb7fa1c29ec62a19ef04dd898a08c.tar.gz CMake-67734be8cf4cb7fa1c29ec62a19ef04dd898a08c.tar.bz2 | |
VS: Simplify object name computation
Simplify cmLocalVisualStudioGenerator::ComputeObjectNameRequirements to
loop over the original vector of source files instead of recursively
traversing source groups just to find the same files. Drop from
cmVisualStudio10TargetGenerator::ComputeObjectNames temporary source
group calculation now that it is not needed for computing object names.
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 9418761..c3629f9 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -872,9 +872,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(); @@ -886,13 +883,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( |