[Cmake-commits] CMake branch, next, updated. v3.2.1-1761-gece47ef

[Stephen Kelly]

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  ece47efcfadae336402a9e58f99534aa243d12c5 (commit)
       via  d824a01b0f2e48cda0c33a8b927489747e33c5e3 (commit)
      from  b0c18ba6de66445ba3d416fc62e6dc924ad380cf (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=ece47efcfadae336402a9e58f99534aa243d12c5
commit ece47efcfadae336402a9e58f99534aa243d12c5
Merge: b0c18ba d824a01
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 15:53:10 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 12 15:53:10 2015 -0400

    Merge topic 'cmake-cleanups' into next
    
    d824a01b Revert "cmake: Simplify command clean up loop."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d824a01b0f2e48cda0c33a8b927489747e33c5e3
commit d824a01b0f2e48cda0c33a8b927489747e33c5e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 21:50:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 21:50:04 2015 +0200

    Revert "cmake: Simplify command clean up loop."
    
    This reverts commit ac11b599f4ec4d753745ba47b921e10d3ae24703.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index a347072..7ccd76a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -197,16 +197,27 @@ void cmake::InitializeProperties()
 void cmake::CleanupCommandsAndMacros()
 {
   this->InitializeProperties();
+  std::vector<cmCommand*> commands;
   for(RegisteredCommandsMap::iterator j = this->Commands.begin();
       j != this->Commands.end(); ++j)
     {
-    if (j->second->IsA("cmMacroHelperCommand") ||
-        j->second->IsA("cmFunctionHelperCommand"))
+    if ( !j->second->IsA("cmMacroHelperCommand") &&
+         !j->second->IsA("cmFunctionHelperCommand"))
+      {
+      commands.push_back(j->second);
+      }
+    else
       {
       delete j->second;
-      this->Commands.erase(j);
       }
     }
+  this->Commands.clear();
+  std::vector<cmCommand*>::iterator it;
+  for ( it = commands.begin(); it != commands.end();
+    ++ it )
+    {
+    this->Commands[cmSystemTools::LowerCase((*it)->GetName())] = *it;
+    }
 }
 
 bool cmake::CommandExists(const std::string& name) const

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

Summary of changes:
 Source/cmake.cxx |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake