diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-04-17 20:59:14 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-05-08 20:58:01 (GMT) |
| commit | c3f41af2be49c1850c526eeac381b0c5989d7f15 (patch) | |
| tree | 76727afb35343e3b254154a7dc56046ed34807a9 /Source/cmMakefile.cxx | |
| parent | c2c2bbb3d49837361ea02483e90e10a632975688 (diff) | |
| download | CMake-c3f41af2be49c1850c526eeac381b0c5989d7f15.zip CMake-c3f41af2be49c1850c526eeac381b0c5989d7f15.tar.gz CMake-c3f41af2be49c1850c526eeac381b0c5989d7f15.tar.bz2 | |
cmMakefile: don't check IsScriptable
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ab0707e..ad35177 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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()) { |