mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-09 23:59:53 -05:00
Remove cmCommand::Enabled and all related accessors
Enabled is never set to false. Remove the member variable and all related getters and setters.
This commit is contained in:
committed by
Brad King
parent
21f449214d
commit
c401f95888
+1
-23
@@ -23,11 +23,10 @@ class cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Construct the command. By default it is enabled with no makefile.
|
||||
* Construct the command. By default it has no makefile.
|
||||
*/
|
||||
cmCommand()
|
||||
: Makefile(CM_NULLPTR)
|
||||
, Enabled(true)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -91,26 +90,6 @@ public:
|
||||
*/
|
||||
virtual std::string GetName() const = 0;
|
||||
|
||||
/**
|
||||
* Enable the command.
|
||||
*/
|
||||
void EnabledOn() { this->Enabled = true; }
|
||||
|
||||
/**
|
||||
* Disable the command.
|
||||
*/
|
||||
void EnabledOff() { this->Enabled = false; }
|
||||
|
||||
/**
|
||||
* Query whether the command is enabled.
|
||||
*/
|
||||
bool GetEnabled() const { return this->Enabled; }
|
||||
|
||||
/**
|
||||
* Disable or enable the command.
|
||||
*/
|
||||
void SetEnabled(bool enabled) { this->Enabled = enabled; }
|
||||
|
||||
/**
|
||||
* Return the last error string.
|
||||
*/
|
||||
@@ -129,7 +108,6 @@ protected:
|
||||
cmCommandArgumentsHelper Helper;
|
||||
|
||||
private:
|
||||
bool Enabled;
|
||||
std::string Error;
|
||||
};
|
||||
|
||||
|
||||
@@ -266,7 +266,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
|
||||
pcmd->SetMakefile(this);
|
||||
|
||||
// Decide whether to invoke the command.
|
||||
if (pcmd->GetEnabled() && !cmSystemTools::GetFatalErrorOccured() &&
|
||||
if (!cmSystemTools::GetFatalErrorOccured() &&
|
||||
(this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
|
||||
pcmd->IsScriptable()))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user