kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Store targets in hash maps

This commit is contained in:
Ben Boeckel 2014-04-30 15:40:39 -04:00
parent ac4106c69a
commit 325599caa2
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalGenerator.cxx
View File

@ -2070,15 +2070,13 @@ cmGlobalGenerator::FindTarget(const std::string& name,
{ {
if (!excludeAliases) if (!excludeAliases)
{ {
std::map<std::string, cmTarget*>::const_iterator ai TargetMap::const_iterator ai = this->AliasTargets.find(name);
= this->AliasTargets.find(name);
if (ai != this->AliasTargets.end()) if (ai != this->AliasTargets.end())
{ {
return ai->second; return ai->second;
} }
} }
std::map<std::string,cmTarget *>::const_iterator i = TargetMap::const_iterator i = this->TotalTargets.find ( name );
this->TotalTargets.find ( name );
if ( i != this->TotalTargets.end() ) if ( i != this->TotalTargets.end() )
{ {
return i->second; return i->second;
@ -2859,7 +2857,7 @@ void cmGlobalGenerator::WriteSummary()
cmGeneratedFileStream fout(fname.c_str()); cmGeneratedFileStream fout(fname.c_str());
// Generate summary information files for each target. // Generate summary information files for each target.
for(std::map<std::string,cmTarget *>::const_iterator ti = for(TargetMap::const_iterator ti =
this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti) this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
{ {
if ((ti->second)->GetType() == cmTarget::INTERFACE_LIBRARY) if ((ti->second)->GetType() == cmTarget::INTERFACE_LIBRARY)

15
Source/cmGlobalGenerator.h
View File

@ -22,6 +22,10 @@
#include "cmGeneratorTarget.h" #include "cmGeneratorTarget.h"
#include "cmGeneratorExpression.h" #include "cmGeneratorExpression.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include <cmsys/hash_map.hxx>
#endif
class cmake; class cmake;
class cmGeneratorTarget; class cmGeneratorTarget;
class cmGeneratorExpressionEvaluationFile; class cmGeneratorExpressionEvaluationFile;
@ -389,9 +393,14 @@ protected:
cmTargetManifest TargetManifest; cmTargetManifest TargetManifest;
// All targets in the entire project. // All targets in the entire project.
std::map<std::string,cmTarget *> TotalTargets; #if defined(CMAKE_BUILD_WITH_CMAKE)
std::map<std::string,cmTarget *> AliasTargets; typedef cmsys::hash_map<std::string, cmTarget*> TargetMap;
std::map<std::string,cmTarget *> ImportedTargets; #else
typedef std::map<std::string,cmTarget *> TargetMap;
#endif
TargetMap TotalTargets;
TargetMap AliasTargets;
TargetMap ImportedTargets;
std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles; std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
virtual const char* GetPredefinedTargetsFolder(); virtual const char* GetPredefinedTargetsFolder();

2
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -341,7 +341,7 @@ void cmGlobalVisualStudio8Generator::Generate()
if(this->AddCheckTarget()) if(this->AddCheckTarget())
{ {
// All targets depend on the build-system check target. // All targets depend on the build-system check target.
for(std::map<std::string,cmTarget *>::const_iterator for(TargetMap::const_iterator
ti = this->TotalTargets.begin(); ti = this->TotalTargets.begin();
ti != this->TotalTargets.end(); ++ti) ti != this->TotalTargets.end(); ++ti)
{ {

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1219,7 +1219,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
void cmGlobalXCodeGenerator::ForceLinkerLanguages() void cmGlobalXCodeGenerator::ForceLinkerLanguages()
{ {
// This makes sure all targets link using the proper language. // This makes sure all targets link using the proper language.
for(std::map<std::string, cmTarget*>::const_iterator for(TargetMap::const_iterator
ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti) ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
{ {
this->ForceLinkerLanguage(*ti->second); this->ForceLinkerLanguage(*ti->second);