summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-03-13 13:17:46 (GMT)
committerBrad King <brad.king@kitware.com>2012-03-13 15:23:14 (GMT)
commitac800f49d07337df79565c77fe0847222ade520b (patch)
tree709081452363f5cc506fa1fb4175417707593ff4
parent9a0d5a828a8f47b4388dbeab8bde9921ee3b7146 (diff)
downloadCMake-ac800f49d07337df79565c77fe0847222ade520b.zip
CMake-ac800f49d07337df79565c77fe0847222ade520b.tar.gz
CMake-ac800f49d07337df79565c77fe0847222ade520b.tar.bz2
Ninja: Constify use of cmCustomCommand
The generator never needs to modify custom command instances.
-rw-r--r--Source/cmGlobalNinjaGenerator.h4
-rw-r--r--Source/cmLocalNinjaGenerator.cxx6
-rw-r--r--Source/cmLocalNinjaGenerator.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index e77252f..39df826 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -270,7 +270,7 @@ private:
/// Called when we have seen the given custom command. Returns true
/// if we has seen it before.
- bool SeenCustomCommand(cmCustomCommand *cc) {
+ bool SeenCustomCommand(cmCustomCommand const *cc) {
return !this->CustomCommands.insert(cc).second;
}
@@ -315,7 +315,7 @@ private:
cmNinjaDeps AllDependencies;
/// 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.
std::set<std::string> CustomCommandOutputs;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index ea03cbb..78072b5 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -343,8 +343,8 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(const cmCustomCommand *cc,
}
void
-cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc,
- const cmNinjaDeps& orderOnlyDeps)
+cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
+ cmCustomCommand const *cc, const cmNinjaDeps& orderOnlyDeps)
{
if (this->GetGlobalNinjaGenerator()->SeenCustomCommand(cc))
return;
@@ -383,7 +383,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc,
}
}
-void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand* cc,
+void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
cmTarget* target)
{
this->CustomCommandTargets[cc].insert(target);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index e9bbf43..28b431d 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -118,17 +118,17 @@ private:
void AppendCustomCommandLines(const cmCustomCommand *cc,
std::vector<std::string> &cmdLines);
void WriteCustomCommandRule();
- void WriteCustomCommandBuildStatement(cmCustomCommand *cc,
+ void WriteCustomCommandBuildStatement(cmCustomCommand const *cc,
const cmNinjaDeps& orderOnlyDeps);
- void AddCustomCommandTarget(cmCustomCommand* cc, cmTarget* target);
+ void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
void WriteCustomCommandBuildStatements();
private:
std::string ConfigName;
std::string HomeRelativeOutputPath;
- typedef std::map<cmCustomCommand*, std::set<cmTarget*> >
+ typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
CustomCommandTargetMap;
CustomCommandTargetMap CustomCommandTargets;
};