diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-25 14:56:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 21:07:46 (GMT) |
| commit | 11165525ba663b4cd7a188c6b698822b8480aafb (patch) | |
| tree | 7a3440126a1359759ff20ee78d3d444bd23dfe70 /Source/cmGeneratorExpression.cxx | |
| parent | 1fdccff5894914d4408e64c0b55e52c376e64ad4 (diff) | |
| download | CMake-11165525ba663b4cd7a188c6b698822b8480aafb.zip CMake-11165525ba663b4cd7a188c6b698822b8480aafb.tar.gz CMake-11165525ba663b4cd7a188c6b698822b8480aafb.tar.bz2 | |
cmGeneratorExpression: Port to cmLocalGenerator.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
| -rw-r--r-- | Source/cmGeneratorExpression.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 80a4f81..ef1679f 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -48,13 +48,13 @@ cmGeneratorExpression::~cmGeneratorExpression() } //---------------------------------------------------------------------------- -const char *cmCompiledGeneratorExpression::Evaluate( - cmMakefile* mf, const std::string& config, bool quiet, +const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg, + const std::string& config, bool quiet, cmTarget const* headTarget, cmGeneratorExpressionDAGChecker *dagChecker, std::string const& language) const { - return this->Evaluate(mf, + return this->Evaluate(lg, config, quiet, headTarget, @@ -65,13 +65,13 @@ const char *cmCompiledGeneratorExpression::Evaluate( //---------------------------------------------------------------------------- const char *cmCompiledGeneratorExpression::Evaluate( - cmMakefile* mf, const std::string& config, bool quiet, + cmLocalGenerator* lg, const std::string& config, bool quiet, cmTarget const* headTarget, cmTarget const* currentTarget, cmGeneratorExpressionDAGChecker *dagChecker, std::string const& language) const { - cmGeneratorExpressionContext context(mf, config, quiet, headTarget, + cmGeneratorExpressionContext context(lg, config, quiet, headTarget, currentTarget ? currentTarget : headTarget, this->EvaluateForBuildsystem, this->Backtrace, language); |