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/cmMakefileTargetGenerator.cxx | |
| 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/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 4ddcac6..abcda21 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -147,8 +147,11 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(additional_clean_files); - cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config, - false, this->Target, 0, 0), + cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator, + config, + false, + this->GeneratorTarget, + 0, 0), this->CleanFiles); } |