diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-02-22 20:41:06 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-03-10 23:12:56 (GMT) |
commit | ec428fafcf9f50c54b163dd16f68063cc387f779 (patch) | |
tree | e489512690971e71aacbaf2edc506802eeab1b33 /Source/cmGeneratorExpression.cxx | |
parent | 082b6a9d78c6198dc7a9891615930c40a5c3b967 (diff) | |
download | CMake-ec428fafcf9f50c54b163dd16f68063cc387f779.zip CMake-ec428fafcf9f50c54b163dd16f68063cc387f779.tar.gz CMake-ec428fafcf9f50c54b163dd16f68063cc387f779.tar.bz2 |
Genex: Extend cmGeneratorExpressionContext constructor.
Initialize the members in the appropriate place.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r-- | Source/cmGeneratorExpression.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index a4990dc..2d795cb 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -72,19 +72,10 @@ const char *cmCompiledGeneratorExpression::Evaluate( cmGeneratorExpressionDAGChecker *dagChecker, std::string const& language) const { - cmGeneratorExpressionContext context; - context.Makefile = mf; - context.Config = config; - context.Quiet = quiet; - context.HadError = false; - context.HadContextSensitiveCondition = false; - context.HadHeadSensitiveCondition = false; - context.SourceSensitiveTargets.clear(); - context.HeadTarget = headTarget; - context.EvaluateForBuildsystem = this->EvaluateForBuildsystem; - context.CurrentTarget = currentTarget ? currentTarget : headTarget; - context.Backtrace = this->Backtrace; - context.Language = language; + cmGeneratorExpressionContext context(mf, config, quiet, headTarget, + currentTarget ? currentTarget : headTarget, + this->EvaluateForBuildsystem, + this->Backtrace, language); return this->EvaluateWithContext(context, dagChecker); } |