diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:10:30 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:42:00 (GMT) |
| commit | a0836ed97804952ace98d2c1d0d46e968a532a3c (patch) | |
| tree | 11c3a118fb30c8cf6eb41eca2898251197edadeb /Source/cmFileCommand.cxx | |
| parent | cbf143bb76604f576275d96a1e1e4c701680ff29 (diff) | |
| download | CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.zip CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.gz CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.bz2 | |
Port to cmMakefile::GetGlobalGenerator.
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 14f397c..12da1fb 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -3568,8 +3568,7 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName, cmsys::auto_ptr<cmCompiledGeneratorExpression> conditionCge = conditionGe.Parse(condition); - this->Makefile->GetLocalGenerator() - ->GetGlobalGenerator()->AddEvaluationFile(inputName, + this->Makefile->GetGlobalGenerator()->AddEvaluationFile(inputName, outputCge, this->Makefile, conditionCge, @@ -3772,8 +3771,8 @@ bool cmFileCommand::HandleLockCommand( fclose(file); // Actual lock/unlock - cmFileLockPool& lockPool = this->Makefile->GetLocalGenerator()-> - GetGlobalGenerator()->GetFileLockPool(); + cmFileLockPool& lockPool = this->Makefile->GetGlobalGenerator() + ->GetFileLockPool(); cmFileLockResult fileLockResult(cmFileLockResult::MakeOk()); if (release) |