[Cmake-commits] CMake branch, next, updated. v2.8.10.1-905-g734358e

[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  734358eb66142706a07215eca0f72ed7d80ace72 (commit)
       via  5ff75873a98fa9f35a80cc7dc092964d0504de8f (commit)
      from  3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60 (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=734358eb66142706a07215eca0f72ed7d80ace72
commit 734358eb66142706a07215eca0f72ed7d80ace72
Merge: 3e0aa4b 5ff7587
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 19 08:40:47 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 19 08:40:47 2012 -0500

    Merge topic 'fix-IMPORTED-GLOBAL-reconfigure' into next
    
    5ff7587 Initialize IMPORTED GLOBAL targets on reconfigure (#13702)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ff75873a98fa9f35a80cc7dc092964d0504de8f
commit 5ff75873a98fa9f35a80cc7dc092964d0504de8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 19 08:30:10 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 19 08:37:10 2012 -0500

    Initialize IMPORTED GLOBAL targets on reconfigure (#13702)
    
    Since commit ca39c5cd (Optionally allow IMPORTED targets to be globally
    visible, 2012-01-25) cmGlobalGenerator has a second member that tracks
    targets with global scope.  We must initialize the new 'ImportedTargets'
    member wherever the old 'TotalTargets' member is initialized.  Without
    this initialization the ImportedTargets member is left with dangling
    pointers during a same-process re-configuration.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8dce053..9059e8a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -817,6 +817,7 @@ void cmGlobalGenerator::Configure()
   this->LocalGenerators.clear();
   this->TargetDependencies.clear();
   this->TotalTargets.clear();
+  this->ImportedTargets.clear();
   this->LocalGeneratorToTargetMap.clear();
   this->ProjectMap.clear();
   this->RuleHashes.clear();

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

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


hooks/post-receive
-- 
CMake