cmMakefile: don't check IsScriptable

This commit is contained in:
Daniel Pfeifer committed 2017-05-08 22:58:01 +02:00
1 parent c2c2bbb3d4
commit c3f41af2be
1 file changed
+1 -14
+1 -14
View File
@@ -272,11 +272,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
pcmd->SetMakefile(this);
// Decide whether to invoke the command.
if (!cmSystemTools::GetFatalErrorOccured() &&
(this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
pcmd->IsScriptable()))
{
if (!cmSystemTools::GetFatalErrorOccured()) {
// if trace is enabled, print out invoke information
if (this->GetCMakeInstance()->GetTrace()) {
this->PrintCommandTrace(lff);
@@ -298,15 +294,6 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
// use the command
this->FinalPassCommands.push_back(pcmd.release());
}
} else if (this->GetCMakeInstance()->GetWorkingMode() ==
cmake::SCRIPT_MODE &&
!pcmd->IsScriptable()) {
std::string error = "Command ";
error += pcmd->GetName();
error += "() is not scriptable";
this->IssueMessage(cmake::FATAL_ERROR, error);
result = false;
cmSystemTools::SetFatalErrorOccured();
}
} else {
if (!cmSystemTools::GetFatalErrorOccured()) {