diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-05 19:50:39 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-14 18:30:09 (GMT) |
| commit | 9486769866661e3aa76dd588ca5a7466e2969dc3 (patch) | |
| tree | 56cbe397c6a522aaf84990c5e8603cba81d5a37f /Source/cmIfCommand.cxx | |
| parent | a3139d4b1512195485cde49d919a13cdaec62660 (diff) | |
| download | CMake-9486769866661e3aa76dd588ca5a7466e2969dc3.zip CMake-9486769866661e3aa76dd588ca5a7466e2969dc3.tar.gz CMake-9486769866661e3aa76dd588ca5a7466e2969dc3.tar.bz2 | |
Don't use a cmLocalGenerator instance to call static methods.
Diffstat (limited to 'Source/cmIfCommand.cxx')
| -rw-r--r-- | Source/cmIfCommand.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 6dea5c1..3551f83 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -20,15 +20,14 @@ static std::string cmIfCommandError( - cmMakefile* mf, std::vector<cmExpandedCommandArgument> const& args) + std::vector<cmExpandedCommandArgument> const& args) { - cmLocalGenerator* lg = mf->GetLocalGenerator(); std::string err = "given arguments:\n "; for(std::vector<cmExpandedCommandArgument>::const_iterator i = args.begin(); i != args.end(); ++i) { err += " "; - err += lg->EscapeForCMake(i->GetValue()); + err += cmLocalGenerator::EscapeForCMake(i->GetValue()); } err += "\n"; return err; @@ -118,7 +117,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, if (!errorString.empty()) { - std::string err = cmIfCommandError(&mf, expandedArguments); + std::string err = cmIfCommandError(expandedArguments); err += errorString; mf.IssueMessage(messType, err); if (messType == cmake::FATAL_ERROR) @@ -206,7 +205,7 @@ bool cmIfCommand if (!errorString.empty()) { - std::string err = cmIfCommandError(this->Makefile, expandedArguments); + std::string err = cmIfCommandError(expandedArguments); err += errorString; if (status == cmake::FATAL_ERROR) { |