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

cmGeneratorTarget: Make some accessors const.

This commit is contained in:
Stephen Kelly 2013-11-03 14:10:12 +01:00
parent 6bdea066e6
commit af4c1096f6
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmGeneratorTarget.cxx
View File

@ -42,16 +42,16 @@ const char *cmGeneratorTarget::GetName() const
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char *cmGeneratorTarget::GetProperty(const char *prop) const char *cmGeneratorTarget::GetProperty(const char *prop) const
{ {
return this->Target->GetProperty(prop); return this->Target->GetProperty(prop);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::vector<cmSourceFile*> const* std::vector<cmSourceFile*> const*
cmGeneratorTarget::GetSourceDepends(cmSourceFile* sf) cmGeneratorTarget::GetSourceDepends(cmSourceFile* sf) const
{ {
SourceEntriesType::iterator i = this->SourceEntries.find(sf); SourceEntriesType::const_iterator i = this->SourceEntries.find(sf);
if(i != this->SourceEntries.end()) if(i != this->SourceEntries.end())
{ {
return &i->second.Depends; return &i->second.Depends;
@ -61,7 +61,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile* sf)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir, bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
const char *config) const char *config) const
{ {
std::string config_upper; std::string config_upper;
if(config && *config) if(config && *config)
@ -70,7 +70,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
} }
typedef std::map<std::string, std::vector<std::string> > IncludeCacheType; typedef std::map<std::string, std::vector<std::string> > IncludeCacheType;
IncludeCacheType::iterator iter = IncludeCacheType::const_iterator iter =
this->SystemIncludesCache.find(config_upper); this->SystemIncludesCache.find(config_upper);
if (iter == this->SystemIncludesCache.end()) if (iter == this->SystemIncludesCache.end())
@ -111,13 +111,13 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGeneratorTarget::GetPropertyAsBool(const char *prop) bool cmGeneratorTarget::GetPropertyAsBool(const char *prop) const
{ {
return this->Target->GetPropertyAsBool(prop); return this->Target->GetPropertyAsBool(prop);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::vector<cmSourceFile*> const& cmGeneratorTarget::GetSourceFiles() std::vector<cmSourceFile*> const& cmGeneratorTarget::GetSourceFiles() const
{ {
return this->Target->GetSourceFiles(); return this->Target->GetSourceFiles();
} }
@ -270,7 +270,8 @@ void cmGeneratorTarget::LookupObjectLibraries()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs) void
cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs) const
{ {
for(std::vector<cmTarget*>::const_iterator for(std::vector<cmTarget*>::const_iterator
ti = this->ObjectLibraries.begin(); ti = this->ObjectLibraries.begin();
@ -571,7 +572,7 @@ void cmGeneratorTarget::TraceDependencies()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGeneratorTarget::GetAppleArchs(const char* config, void cmGeneratorTarget::GetAppleArchs(const char* config,
std::vector<std::string>& archVec) std::vector<std::string>& archVec) const
{ {
const char* archs = 0; const char* archs = 0;
if(config && *config) if(config && *config)
@ -591,7 +592,7 @@ void cmGeneratorTarget::GetAppleArchs(const char* config,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmGeneratorTarget::GetCreateRuleVariable() const char* cmGeneratorTarget::GetCreateRuleVariable() const
{ {
switch(this->GetType()) switch(this->GetType())
{ {
@ -617,7 +618,7 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories(
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGeneratorTarget::GenerateTargetManifest(const char* config) void cmGeneratorTarget::GenerateTargetManifest(const char* config) const
{ {
if (this->Target->IsImported()) if (this->Target->IsImported())
{ {

20
Source/cmGeneratorTarget.h
View File

@ -28,9 +28,9 @@ public:
int GetType() const; int GetType() const;
const char *GetName() const; const char *GetName() const;
const char *GetProperty(const char *prop); const char *GetProperty(const char *prop) const;
bool GetPropertyAsBool(const char *prop); bool GetPropertyAsBool(const char *prop) const;
std::vector<cmSourceFile*> const& GetSourceFiles(); std::vector<cmSourceFile*> const& GetSourceFiles() const;
cmTarget* Target; cmTarget* Target;
cmMakefile* Makefile; cmMakefile* Makefile;
@ -60,22 +60,22 @@ public:
std::vector<cmTarget*> ObjectLibraries; std::vector<cmTarget*> ObjectLibraries;
void UseObjectLibraries(std::vector<std::string>& objs); void UseObjectLibraries(std::vector<std::string>& objs) const;
void GetAppleArchs(const char* config, void GetAppleArchs(const char* config,
std::vector<std::string>& archVec); std::vector<std::string>& archVec) const;
///! Return the rule variable used to create this type of target, ///! Return the rule variable used to create this type of target,
// need to add CMAKE_(LANG) for full name. // need to add CMAKE_(LANG) for full name.
const char* GetCreateRuleVariable(); const char* GetCreateRuleVariable() const;
/** Get the include directories for this target. */ /** Get the include directories for this target. */
std::vector<std::string> GetIncludeDirectories(const char *config); std::vector<std::string> GetIncludeDirectories(const char *config);
bool IsSystemIncludeDirectory(const char *dir, const char *config); bool IsSystemIncludeDirectory(const char *dir, const char *config) const;
/** Add the target output files to the global generator manifest. */ /** Add the target output files to the global generator manifest. */
void GenerateTargetManifest(const char* config); void GenerateTargetManifest(const char* config) const;
/** /**
* Trace through the source files in this target and add al source files * Trace through the source files in this target and add al source files
@ -87,14 +87,14 @@ public:
void LookupObjectLibraries(); void LookupObjectLibraries();
/** Get sources that must be built before the given source. */ /** Get sources that must be built before the given source. */
std::vector<cmSourceFile*> const* GetSourceDepends(cmSourceFile* sf); std::vector<cmSourceFile*> const* GetSourceDepends(cmSourceFile* sf) const;
struct SourceEntry { std::vector<cmSourceFile*> Depends; }; struct SourceEntry { std::vector<cmSourceFile*> Depends; };
typedef std::map<cmSourceFile*, SourceEntry> SourceEntriesType; typedef std::map<cmSourceFile*, SourceEntry> SourceEntriesType;
SourceEntriesType SourceEntries; SourceEntriesType SourceEntries;
private: private:
std::map<std::string, std::vector<std::string> > SystemIncludesCache; mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;
cmGeneratorTarget(cmGeneratorTarget const&); cmGeneratorTarget(cmGeneratorTarget const&);
void operator=(cmGeneratorTarget const&); void operator=(cmGeneratorTarget const&);