diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-14 17:35:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-14 17:35:59 (GMT) |
| commit | ad3ff60f4a026d94fba7530325278ecd93a7357d (patch) | |
| tree | 674071e46c0cb77a9c1ee1965d28544001d7d456 /Source/cmGeneratorExpressionContext.h | |
| parent | ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (diff) | |
| parent | 2293d43d00ddcff86c70f0b06014223f3b01e36c (diff) | |
| download | CMake-ad3ff60f4a026d94fba7530325278ecd93a7357d.zip CMake-ad3ff60f4a026d94fba7530325278ecd93a7357d.tar.gz CMake-ad3ff60f4a026d94fba7530325278ecd93a7357d.tar.bz2 | |
Merge topic 'genex-generator-objects'
2293d43d cmLocalGenerator: Store cmGeneratorTargets.
488723f5 cmMakefile: Store container of cmExportBuildFileGenerators.
15834405 cmGeneratorExpression: Port interface to cmGeneratorTarget.
11165525 cmGeneratorExpression: Port to cmLocalGenerator.
Diffstat (limited to 'Source/cmGeneratorExpressionContext.h')
| -rw-r--r-- | Source/cmGeneratorExpressionContext.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index ed83509..bbf0fcf 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -19,13 +19,15 @@ #include <string> class cmTarget; +class cmGeneratorTarget; +class cmLocalGenerator; //---------------------------------------------------------------------------- struct cmGeneratorExpressionContext { - cmGeneratorExpressionContext(cmMakefile* mf, std::string const& config, - bool quiet, cmTarget const* headTarget, - cmTarget const* currentTarget, + cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config, + bool quiet, const cmGeneratorTarget* headTarget, + cmGeneratorTarget const* currentTarget, bool evaluateForBuildsystem, cmListFileBacktrace const& backtrace, std::string const& language); @@ -38,7 +40,7 @@ struct cmGeneratorExpressionContext std::set<cmTarget const*> SourceSensitiveTargets; std::map<cmTarget const*, std::map<std::string, std::string> > MaxLanguageStandard; - cmMakefile *Makefile; + cmLocalGenerator *LG; std::string Config; std::string Language; cmTarget const* HeadTarget; // The target whose property is being evaluated. |