Browse Source

Remove cmCommand::Enabled and all related accessors

Enabled is never set to false.  Remove the member variable and all
related getters and setters.
pull/279/head
Daniel Pfeifer 9 years ago
committed by Brad King
parent
commit
c401f95888
  1. 24
      Source/cmCommand.h
  2. 2
      Source/cmMakefile.cxx

24
Source/cmCommand.h

@ -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;
};

2
Source/cmMakefile.cxx

@ -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()))

Loading…
Cancel
Save