Commit 480ba643 authored by David Cole's avatar David Cole Committed by Kitware Robot
Browse files

Merge topic 'rename-used-commands'

89403bf8 Rename UsedCommands to FinalPassCommands
parents ec50093b 89403bf8
...@@ -210,9 +210,9 @@ cmMakefile::~cmMakefile() ...@@ -210,9 +210,9 @@ cmMakefile::~cmMakefile()
{ {
delete *i; delete *i;
} }
for(unsigned int i=0; i < this->UsedCommands.size(); i++) for(unsigned int i=0; i < this->FinalPassCommands.size(); i++)
{ {
delete this->UsedCommands[i]; delete this->FinalPassCommands[i];
} }
std::vector<cmFunctionBlocker*>::iterator pos; std::vector<cmFunctionBlocker*>::iterator pos;
for (pos = this->FunctionBlockers.begin(); for (pos = this->FunctionBlockers.begin();
...@@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, ...@@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
else if(pcmd->HasFinalPass()) else if(pcmd->HasFinalPass())
{ {
// use the command // use the command
this->UsedCommands.push_back(pcmd.release()); this->FinalPassCommands.push_back(pcmd.release());
} }
} }
else if ( this->GetCMakeInstance()->GetWorkingMode() == cmake::SCRIPT_MODE else if ( this->GetCMakeInstance()->GetWorkingMode() == cmake::SCRIPT_MODE
...@@ -813,8 +813,8 @@ void cmMakefile::FinalPass() ...@@ -813,8 +813,8 @@ void cmMakefile::FinalPass()
// give all the commands a chance to do something // give all the commands a chance to do something
// after the file has been parsed before generation // after the file has been parsed before generation
for(std::vector<cmCommand*>::iterator i = this->UsedCommands.begin(); for(std::vector<cmCommand*>::iterator i = this->FinalPassCommands.begin();
i != this->UsedCommands.end(); ++i) i != this->FinalPassCommands.end(); ++i)
{ {
(*i)->FinalPass(); (*i)->FinalPass();
} }
......
...@@ -620,12 +620,6 @@ public: ...@@ -620,12 +620,6 @@ public:
*/ */
bool CanIWriteThisFile(const char* fileName); bool CanIWriteThisFile(const char* fileName);
/**
* Get the vector of used command instances.
*/
const std::vector<cmCommand*>& GetUsedCommands() const
{return this->UsedCommands;}
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
/** /**
* Get the vector source groups. * Get the vector source groups.
...@@ -913,7 +907,7 @@ protected: ...@@ -913,7 +907,7 @@ protected:
std::vector<cmSourceGroup> SourceGroups; std::vector<cmSourceGroup> SourceGroups;
#endif #endif
std::vector<cmCommand*> UsedCommands; std::vector<cmCommand*> FinalPassCommands;
cmLocalGenerator* LocalGenerator; cmLocalGenerator* LocalGenerator;
bool IsFunctionBlocked(const cmListFileFunction& lff, bool IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus &status); cmExecutionStatus &status);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment