diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-02-22 16:43:13 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-03-07 12:19:45 (GMT) |
| commit | e387ce7d681f9bd6c90c41f34b7500dfeb3b32ba (patch) | |
| tree | 0ba79cecd48ff485649045fcfdde434492c8ecb5 /Source/cmGeneratorExpression.cxx | |
| parent | 4a0128f42feb7da9b6bebe0c2c3aa7a756b96822 (diff) | |
| download | CMake-e387ce7d681f9bd6c90c41f34b7500dfeb3b32ba.zip CMake-e387ce7d681f9bd6c90c41f34b7500dfeb3b32ba.tar.gz CMake-e387ce7d681f9bd6c90c41f34b7500dfeb3b32ba.tar.bz2 | |
Genex: Add a COMPILE_LANGUAGE generator expression.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
| -rw-r--r-- | Source/cmGeneratorExpression.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index bf96951..0a27016 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -52,14 +52,16 @@ cmGeneratorExpression::~cmGeneratorExpression() const char *cmCompiledGeneratorExpression::Evaluate( cmMakefile* mf, const std::string& config, bool quiet, cmTarget const* headTarget, - cmGeneratorExpressionDAGChecker *dagChecker) const + cmGeneratorExpressionDAGChecker *dagChecker, + std::string const& language) const { return this->Evaluate(mf, config, quiet, headTarget, headTarget, - dagChecker); + dagChecker, + language); } //---------------------------------------------------------------------------- @@ -67,7 +69,8 @@ const char *cmCompiledGeneratorExpression::Evaluate( cmMakefile* mf, const std::string& config, bool quiet, cmTarget const* headTarget, cmTarget const* currentTarget, - cmGeneratorExpressionDAGChecker *dagChecker) const + cmGeneratorExpressionDAGChecker *dagChecker, + std::string const& language) const { if (!this->NeedsEvaluation) { @@ -93,6 +96,7 @@ const char *cmCompiledGeneratorExpression::Evaluate( context.EvaluateForBuildsystem = this->EvaluateForBuildsystem; context.CurrentTarget = currentTarget ? currentTarget : headTarget; context.Backtrace = this->Backtrace; + context.Language = language; for ( ; it != end; ++it) { |