mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-18 01:31:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: don't check IsScriptable

Browse Source
This commit is contained in:
Daniel Pfeifer
2017-04-17 22:59:14 +02:00
parent c2c2bbb3d4
commit c3f41af2be
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmMakefile.cxx
View File

@@ -272,11 +272,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
pcmd->SetMakefile(this); pcmd->SetMakefile(this);
// Decide whether to invoke the command. // Decide whether to invoke the command.
if (!cmSystemTools::GetFatalErrorOccured() && if (!cmSystemTools::GetFatalErrorOccured()) {
(this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
pcmd->IsScriptable()))
{
// if trace is enabled, print out invoke information // if trace is enabled, print out invoke information
if (this->GetCMakeInstance()->GetTrace()) { if (this->GetCMakeInstance()->GetTrace()) {
this->PrintCommandTrace(lff); this->PrintCommandTrace(lff);
@@ -298,15 +294,6 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
// use the command // use the command
this->FinalPassCommands.push_back(pcmd.release()); 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 { } else {
if (!cmSystemTools::GetFatalErrorOccured()) { if (!cmSystemTools::GetFatalErrorOccured()) {