diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-06 13:38:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-06 13:38:22 (GMT) |
| commit | 370e2c6785ce9167c9945763505353816780326c (patch) | |
| tree | 8922acb80277b726b85f74636de4482c1d28621b /Source/cmFileCommand.cxx | |
| parent | 4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 (diff) | |
| parent | 12c3f24827d2459154fcc9773b279f96c303e591 (diff) | |
| download | CMake-370e2c6785ce9167c9945763505353816780326c.zip CMake-370e2c6785ce9167c9945763505353816780326c.tar.gz CMake-370e2c6785ce9167c9945763505353816780326c.tar.bz2 | |
Merge topic 'refactor-evaluation-files'
12c3f248 cmGeneratorExpressionEvaluationFile: Require generator context.
6c0e9ee2 cmMakefile: Store EvaluationFiles.
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 0daed66..87faf84 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -3573,11 +3573,8 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName, cmsys::auto_ptr<cmCompiledGeneratorExpression> conditionCge = conditionGe.Parse(condition); - this->Makefile->GetGlobalGenerator()->AddEvaluationFile(inputName, - outputCge, - this->Makefile, - conditionCge, - inputIsContent); + this->Makefile->AddEvaluationFile(inputName, outputCge, + conditionCge, inputIsContent); } //---------------------------------------------------------------------------- |