mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-20 14:10:27 -06:00
cmCommand: remove FinalPass from interface
This commit is contained in:
committed by
Regina Pfeifer
parent
fbee46e262
commit
732dd344b9
@@ -60,19 +60,6 @@ public:
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus&) = 0;
|
||||
|
||||
/**
|
||||
* This is called at the end after all the information
|
||||
* specified by the command is accumulated. Most commands do
|
||||
* not implement this method. At this point, reading and
|
||||
* writing to the cache can be done.
|
||||
*/
|
||||
virtual void FinalPass() {}
|
||||
|
||||
/**
|
||||
* Does this command have a final pass? Query after InitialPass.
|
||||
*/
|
||||
virtual bool HasFinalPass() const { return false; }
|
||||
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
|
||||
@@ -38,10 +38,6 @@ public:
|
||||
bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus& status) override;
|
||||
|
||||
void FinalPass() override { this->Command->FinalPass(); }
|
||||
|
||||
bool HasFinalPass() const override { return this->Command->HasFinalPass(); }
|
||||
|
||||
private:
|
||||
std::unique_ptr<cmCommand> Command;
|
||||
cmPolicies::PolicyID Policy;
|
||||
|
||||
@@ -355,20 +355,6 @@ private:
|
||||
cmMakefile* Makefile;
|
||||
};
|
||||
|
||||
class cmFinalPassAction
|
||||
{
|
||||
public:
|
||||
cmFinalPassAction(std::unique_ptr<cmCommand> command)
|
||||
: Command(std::move(command))
|
||||
{
|
||||
}
|
||||
|
||||
void operator()(cmMakefile&) { this->Command->FinalPass(); }
|
||||
|
||||
private:
|
||||
std::shared_ptr<cmCommand> Command;
|
||||
};
|
||||
|
||||
bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
|
||||
cmExecutionStatus& status)
|
||||
{
|
||||
@@ -429,9 +415,6 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
|
||||
if (this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE) {
|
||||
cmSystemTools::SetFatalErrorOccured();
|
||||
}
|
||||
} else if (pcmd->HasFinalPass()) {
|
||||
// use the command
|
||||
this->AddFinalAction(cmFinalPassAction(std::move(pcmd)));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user