summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudioGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-03-06 14:31:43 (GMT)
committerBrad King <brad.king@kitware.com>2012-03-06 18:30:19 (GMT)
commit67734be8cf4cb7fa1c29ec62a19ef04dd898a08c (patch)
tree83da920648a7c7bf558e87a48f32e2aac318059b /Source/cmLocalVisualStudioGenerator.h
parent4ae7f3656b6ebe7c878716b95ef5eb3d924d4173 (diff)
downloadCMake-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/cmLocalVisualStudioGenerator.h')
-rw-r--r--Source/cmLocalVisualStudioGenerator.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index fcf1f21..e58c757 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -65,12 +65,8 @@ protected:
MaybeCreateImplibDir(cmTarget& target, const char* config, bool isFortran);
// Safe object file name generation.
- void ComputeObjectNameRequirements(std::vector<cmSourceGroup> const&);
+ void ComputeObjectNameRequirements(std::vector<cmSourceFile*> const&);
bool SourceFileCompiles(const cmSourceFile* sf);
- void CountObjectNames(const std::vector<cmSourceGroup>& groups,
- std::map<cmStdString, int>& count);
- void InsertNeedObjectNames(const std::vector<cmSourceGroup>& groups,
- std::map<cmStdString, int>& count);
std::set<const cmSourceFile*> NeedObjectName;
friend class cmVisualStudio10TargetGenerator;