[Cmake-commits] CMake branch, next, updated. v2.8.12-4866-gd1e4f97

[Brad King]

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  d1e4f972b67d314dbc75022b67e6e2fa72e2a130 (commit)
       via  2e388cc3c2c0f670b9f1f53a0fbc1217db3c72e3 (commit)
      from  0ae02782f5c1f62959bc62e7c01c89b54e0df271 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1e4f972b67d314dbc75022b67e6e2fa72e2a130
commit d1e4f972b67d314dbc75022b67e6e2fa72e2a130
Merge: 0ae0278 2e388cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 16:30:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 16:30:46 2013 -0500

    Merge topic 'clear-evaluation-files' into next
    
    2e388cc file(GENERATE): Clear internal records between configures


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e388cc3c2c0f670b9f1f53a0fbc1217db3c72e3
commit 2e388cc3c2c0f670b9f1f53a0fbc1217db3c72e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 16:10:07 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 16:14:49 2013 -0500

    file(GENERATE): Clear internal records between configures
    
    In the CMake interactive dialogs cmGlobalGenerator::Configure may
    run more than once.  Clear the cmGlobalGenerator::EvaluationFiles
    data between configures to avoid accessing deleted data.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7f2b592..5fefeba 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -848,6 +848,14 @@ void cmGlobalGenerator::Configure()
     delete this->LocalGenerators[i];
     }
   this->LocalGenerators.clear();
+  for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
+      li = this->EvaluationFiles.begin();
+      li != this->EvaluationFiles.end();
+      ++li)
+    {
+    delete *li;
+    }
+  this->EvaluationFiles.clear();
   this->TargetDependencies.clear();
   this->TotalTargets.clear();
   this->ImportedTargets.clear();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake