diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-01 10:05:13 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-01 11:07:11 (GMT) |
| commit | 6c0e9ee276e9e35a970990baec09c0c2c85b3804 (patch) | |
| tree | 1ab194088ca83c2e6bcb6c5bfd09ac69a8e3be13 /Source/cmFileCommand.cxx | |
| parent | 9432b14e916421a727265f9a05dc1fbe6c6ec381 (diff) | |
| download | CMake-6c0e9ee276e9e35a970990baec09c0c2c85b3804.zip CMake-6c0e9ee276e9e35a970990baec09c0c2c85b3804.tar.gz CMake-6c0e9ee276e9e35a970990baec09c0c2c85b3804.tar.bz2 | |
cmMakefile: Store EvaluationFiles.
Relieve the cmGlobalGenerator of this responsibility. Evaluate
the generator expressions in the context of the cmLocalGenerator.
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); } //---------------------------------------------------------------------------- |