diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-12-26 09:38:36 (GMT) |
---|---|---|
committer | Regina Pfeifer <regina@mailbox.org> | 2019-07-21 07:25:32 (GMT) |
commit | 1eebc2956321c2e7da00a5d35e207bedb899c804 (patch) | |
tree | a8c98c7349a686061cb035e8859e8925bc79c458 /Source/cmCommand.h | |
parent | 82aa6941e9b292d95820b5723b4dcc8b70fbb417 (diff) | |
download | CMake-1eebc2956321c2e7da00a5d35e207bedb899c804.zip CMake-1eebc2956321c2e7da00a5d35e207bedb899c804.tar.gz CMake-1eebc2956321c2e7da00a5d35e207bedb899c804.tar.bz2 |
cmCommand: deprecate functions GetMakefile and SetError
Replace the members for the Makefile and the Error with a
cmExecutionStatus. Re-implement GetMakefile and SetError based on that.
Both functions should be called directly on the cmExecutionStatus that is
passed to InitialPass. This will help us make all Commands immutable and
remove the need for cloning.
Diffstat (limited to 'Source/cmCommand.h')
-rw-r--r-- | Source/cmCommand.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmCommand.h b/Source/cmCommand.h index b210f27..6d3a5fa 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -42,9 +42,11 @@ public: /** * Specify the makefile. */ - void SetMakefile(cmMakefile* m) { this->Makefile = m; } cmMakefile* GetMakefile() { return this->Makefile; } + void SetExecutionStatus(cmExecutionStatus* s); + cmExecutionStatus* GetExecutionStatus() { return this->Status; }; + /** * This is called by the cmMakefile when the command is first * encountered in the CMakeLists.txt file. It expands the command's @@ -66,11 +68,6 @@ public: virtual std::unique_ptr<cmCommand> Clone() = 0; /** - * Return the last error string. - */ - const char* GetError(); - - /** * Set the error message */ void SetError(const std::string& e); @@ -79,7 +76,7 @@ protected: cmMakefile* Makefile = nullptr; private: - std::string Error; + cmExecutionStatus* Status = nullptr; }; #endif |