diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-25 16:56:52 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 23:07:46 +0200 |
| commit | 11165525ba663b4cd7a188c6b698822b8480aafb (patch) | |
| tree | 7a3440126a1359759ff20ee78d3d444bd23dfe70 /Source/cmCustomCommandGenerator.cxx | |
| parent | 1fdccff5894914d4408e64c0b55e52c376e64ad4 (diff) | |
| download | cmake-11165525ba663b4cd7a188c6b698822b8480aafb.tar.gz | |
cmGeneratorExpression: Port to cmLocalGenerator.
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
| -rw-r--r-- | Source/cmCustomCommandGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 4b6bd5034e..7f02afed8b 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -50,8 +50,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const { return target->GetLocation(this->Config); } - return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(), - this->Config); + return this->GE->Parse(argv0)->Evaluate(this->LG, this->Config); } //---------------------------------------------------------------------------- @@ -92,7 +91,7 @@ cmCustomCommandGenerator for(unsigned int j=1;j < commandLine.size(); ++j) { std::string arg = - this->GE->Parse(commandLine[j])->Evaluate(this->LG->GetMakefile(), + this->GE->Parse(commandLine[j])->Evaluate(this->LG, this->Config); cmd += " "; if(this->OldStyle) @@ -146,7 +145,7 @@ std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const = this->GE->Parse(*i); std::vector<std::string> result; cmSystemTools::ExpandListArgument( - cge->Evaluate(this->LG->GetMakefile(), this->Config), result); + cge->Evaluate(this->LG, this->Config), result); for (std::vector<std::string>::iterator it = result.begin(); it != result.end(); ++it) { |