diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-01-06 22:16:18 (GMT) |
---|---|---|
committer | Regina Pfeifer <regina@mailbox.org> | 2019-07-18 15:35:43 (GMT) |
commit | 732dd344b974d880402b0cb047de328eca1df666 (patch) | |
tree | 717e4d48e12d7262de96c62a7409edab8aed7df8 | |
parent | fbee46e262044ac71170552adc4eb656ef0b030b (diff) | |
download | CMake-732dd344b974d880402b0cb047de328eca1df666.zip CMake-732dd344b974d880402b0cb047de328eca1df666.tar.gz CMake-732dd344b974d880402b0cb047de328eca1df666.tar.bz2 |
cmCommand: remove FinalPass from interface
-rw-r--r-- | Source/cmCommand.h | 13 | ||||
-rw-r--r-- | Source/cmDisallowedCommand.h | 4 | ||||
-rw-r--r-- | Source/cmMakefile.cxx | 17 |
3 files changed, 0 insertions, 34 deletions
diff --git a/Source/cmCommand.h b/Source/cmCommand.h index cdd2aba..b210f27 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -61,19 +61,6 @@ public: 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. */ virtual std::unique_ptr<cmCommand> Clone() = 0; diff --git a/Source/cmDisallowedCommand.h b/Source/cmDisallowedCommand.h index eed59ca..e07f255 100644 --- a/Source/cmDisallowedCommand.h +++ b/Source/cmDisallowedCommand.h @@ -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; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a350789..d2b0ae6 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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 { |