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

Merge topic 'rename-used-commands' 

89403bf Rename UsedCommands to FinalPassCommands
This commit is contained in:
David Cole 2012-03-06 15:24:40 -05:00 committed by CMake Topic Stage
parent ec50093be7 89403bf87f
commit 480ba64343
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmMakefile.cxx
View File

@ -210,9 +210,9 @@ cmMakefile::~cmMakefile()
{
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;
for (pos = this->FunctionBlockers.begin();
@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
else if(pcmd->HasFinalPass())
{
// use the command
this->UsedCommands.push_back(pcmd.release());
this->FinalPassCommands.push_back(pcmd.release());
}
}
else if ( this->GetCMakeInstance()->GetWorkingMode() == cmake::SCRIPT_MODE
@ -813,8 +813,8 @@ void cmMakefile::FinalPass()
// give all the commands a chance to do something
// after the file has been parsed before generation
for(std::vector<cmCommand*>::iterator i = this->UsedCommands.begin();
i != this->UsedCommands.end(); ++i)
for(std::vector<cmCommand*>::iterator i = this->FinalPassCommands.begin();
i != this->FinalPassCommands.end(); ++i)
{
(*i)->FinalPass();
}

8
Source/cmMakefile.h
View File

@ -620,12 +620,6 @@ public:
*/
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)
/**
* Get the vector source groups.
@ -913,7 +907,7 @@ protected:
std::vector<cmSourceGroup> SourceGroups;
#endif
std::vector<cmCommand*> UsedCommands;
std::vector<cmCommand*> FinalPassCommands;
cmLocalGenerator* LocalGenerator;
bool IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus &status);