This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via a8e25daac7e967cb8ca9c7c71710b424c28041f3 (commit) via 0e013bb7ee45f8ba31582005885b855f7a2407ef (commit) from f6043d59e60d6aa4eb12cb091d4b906e01c4b607 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8e25daac7e967cb8ca9c7c71710b424c28041f3 commit a8e25daac7e967cb8ca9c7c71710b424c28041f3 Merge: f6043d5 0e013bb Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Oct 7 16:06:04 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Oct 7 16:06:04 2015 -0400 Merge topic 'add-cmLocalGenerator-API' into next 0e013bb7 Revert "Remove some needless GetMakefile() calls." https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e013bb7ee45f8ba31582005885b855f7a2407ef commit 0e013bb7ee45f8ba31582005885b855f7a2407ef Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Oct 7 22:05:47 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Oct 7 22:05:47 2015 +0200 Revert "Remove some needless GetMakefile() calls." This reverts commit fd6692825f5e4b9787746e2811a8a53e33886138. diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 4b6bd50..7f3b651 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -101,7 +101,7 @@ cmCustomCommandGenerator } else { - cmOutputConverter converter(this->LG->GetStateSnapshot()); + cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot()); cmd += converter.EscapeForShell(arg, this->MakeVars); } } diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index 8ac5cbc..e4d9f10 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg) { std::ostringstream e; e << "Evaluation file \"" << this->Input << "\" cannot be read."; - lg->IssueMessage(cmake::FATAL_ERROR, e.str()); + lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str()); return; } diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 73bcd2b..0064713 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3 // The directory-level rule should depend on the directory-level // rules of the subdirectories. std::vector<cmState::Snapshot> children - = lg->GetStateSnapshot().GetChildren(); + = lg->GetMakefile()->GetStateSnapshot().GetChildren(); for(std::vector<cmState::Snapshot>::const_iterator ci = children.begin(); ci != children.end(); ++ci) { ----------------------------------------------------------------------- Summary of changes: Source/cmCustomCommandGenerator.cxx | 2 +- Source/cmGeneratorExpressionEvaluationFile.cxx | 2 +- Source/cmGlobalUnixMakefileGenerator3.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits