[Cmake-commits] CMake branch, next, updated. v3.2.2-2457-g7629a8c

[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  7629a8ccab28ee6d6a60e5fb8c89d1e2eb8fc024 (commit)
       via  83dc483e4e35b528a5ece7a336399a994bd3f67e (commit)
      from  a9884e44e9f074b0747bbad4ed926b94f8ffb3d5 (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=7629a8ccab28ee6d6a60e5fb8c89d1e2eb8fc024
commit 7629a8ccab28ee6d6a60e5fb8c89d1e2eb8fc024
Merge: a9884e4 83dc483
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 3 14:39:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 3 14:39:22 2015 -0400

    Merge topic 'truncate-snapshots' into next
    
    83dc483e cmState: Truncate snapshot data in Initialize.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83dc483e4e35b528a5ece7a336399a994bd3f67e
commit 83dc483e4e35b528a5ece7a336399a994bd3f67e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 3 20:36:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 3 20:36:29 2015 +0200

    cmState: Truncate snapshot data in Initialize.
    
    When Configure is executed multiple times with the same cmake
    instance (either using CTest --two-config or a interactive gui), the
    location and structural data was preserved though it would not be used
    again.  Fix that by clearing the data in a method called early in
    the configure step.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 24cbc4a..67a2274 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -22,7 +22,6 @@ cmState::cmState(cmake* cm)
   : CMakeInstance(cm),
     IsInTryCompile(false)
 {
-  this->CreateSnapshot(Snapshot());
   this->Initialize();
 }
 
@@ -194,8 +193,12 @@ void cmState::RemoveCacheEntryProperty(std::string const& key,
 void cmState::Initialize()
 {
   this->GlobalProperties.clear();
-
   this->PropertyDefinitions.clear();
+  this->Locations.clear();
+  this->OutputLocations.clear();
+  this->ParentPositions.clear();
+
+  this->CreateSnapshot(Snapshot());
   this->DefineProperty
     ("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY,
      "", "", true);

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

Summary of changes:
 Source/cmState.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake