diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:38:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 21:07:46 (GMT) |
| commit | 1583440509a148d216d6691cdaeede1aa24af95c (patch) | |
| tree | bd79dcda7cd69b5f0257fd81d00e796c3462d273 /Source/cmGeneratorExpressionContext.cxx | |
| parent | 11165525ba663b4cd7a188c6b698822b8480aafb (diff) | |
| download | CMake-1583440509a148d216d6691cdaeede1aa24af95c.zip CMake-1583440509a148d216d6691cdaeede1aa24af95c.tar.gz CMake-1583440509a148d216d6691cdaeede1aa24af95c.tar.bz2 | |
cmGeneratorExpression: Port interface to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGeneratorExpressionContext.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionContext.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx index cd056a0..4daf4e9 100644 --- a/Source/cmGeneratorExpressionContext.cxx +++ b/Source/cmGeneratorExpressionContext.cxx @@ -11,11 +11,12 @@ ============================================================================*/ #include "cmGeneratorExpressionContext.h" +#include "cmGeneratorTarget.h" cmGeneratorExpressionContext::cmGeneratorExpressionContext( cmLocalGenerator* lg, std::string const& config, - bool quiet, cmTarget const* headTarget, - cmTarget const* currentTarget, + bool quiet, cmGeneratorTarget const* headTarget, + const cmGeneratorTarget* currentTarget, bool evaluateForBuildsystem, cmListFileBacktrace const& backtrace, std::string const& language) @@ -23,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext( LG(lg), Config(config), Language(language), - HeadTarget(headTarget), - CurrentTarget(currentTarget), + HeadTarget(headTarget ? headTarget->Target : 0), + CurrentTarget(currentTarget ? currentTarget->Target : 0), Quiet(quiet), HadError(false), HadContextSensitiveCondition(false), |