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

Ninja: Constify use of cmCustomCommand 

The generator never needs to modify custom command instances.
This commit is contained in:
Brad King 2012-03-13 09:17:46 -04:00
parent 9a0d5a828a
commit ac800f49d0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalNinjaGenerator.h
View File

@ -270,7 +270,7 @@ private:
/// Called when we have seen the given custom command. Returns true /// Called when we have seen the given custom command. Returns true
/// if we has seen it before. /// if we has seen it before.
bool SeenCustomCommand(cmCustomCommand *cc) { bool SeenCustomCommand(cmCustomCommand const *cc) {
return !this->CustomCommands.insert(cc).second; return !this->CustomCommands.insert(cc).second;
} }
@ -315,7 +315,7 @@ private:
cmNinjaDeps AllDependencies; cmNinjaDeps AllDependencies;
/// The set of custom commands we have seen. /// The set of custom commands we have seen.
std::set<cmCustomCommand *> CustomCommands; std::set<cmCustomCommand const*> CustomCommands;
/// The set of custom command outputs we have seen. /// The set of custom command outputs we have seen.
std::set<std::string> CustomCommandOutputs; std::set<std::string> CustomCommandOutputs;

6
Source/cmLocalNinjaGenerator.cxx
View File

@ -343,8 +343,8 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(const cmCustomCommand *cc,
} }
void void
cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc, cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
const cmNinjaDeps& orderOnlyDeps) cmCustomCommand const *cc, const cmNinjaDeps& orderOnlyDeps)
{ {
if (this->GetGlobalNinjaGenerator()->SeenCustomCommand(cc)) if (this->GetGlobalNinjaGenerator()->SeenCustomCommand(cc))
return; return;
@ -383,7 +383,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc,
} }
} }
void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand* cc, void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
cmTarget* target) cmTarget* target)
{ {
this->CustomCommandTargets[cc].insert(target); this->CustomCommandTargets[cc].insert(target);

6
Source/cmLocalNinjaGenerator.h
View File

@ -118,17 +118,17 @@ private:
void AppendCustomCommandLines(const cmCustomCommand *cc, void AppendCustomCommandLines(const cmCustomCommand *cc,
std::vector<std::string> &cmdLines); std::vector<std::string> &cmdLines);
void WriteCustomCommandRule(); void WriteCustomCommandRule();
void WriteCustomCommandBuildStatement(cmCustomCommand *cc, void WriteCustomCommandBuildStatement(cmCustomCommand const *cc,
const cmNinjaDeps& orderOnlyDeps); const cmNinjaDeps& orderOnlyDeps);
void AddCustomCommandTarget(cmCustomCommand* cc, cmTarget* target); void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
void WriteCustomCommandBuildStatements(); void WriteCustomCommandBuildStatements();
private: private:
std::string ConfigName; std::string ConfigName;
std::string HomeRelativeOutputPath; std::string HomeRelativeOutputPath;
typedef std::map<cmCustomCommand*, std::set<cmTarget*> > typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
CustomCommandTargetMap; CustomCommandTargetMap;
CustomCommandTargetMap CustomCommandTargets; CustomCommandTargetMap CustomCommandTargets;
}; };