[Cmake-commits] CMake branch, next, updated. v3.3.1-2881-g57323ce

[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  57323ce547ed6f3abcb68de6354c64758faed2fd (commit)
       via  128f7e34e99de725b7750531d9285763818e58ab (commit)
       via  3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15 (commit)
      from  69b867af86b42d356f034529519e55fa6e7fb2f5 (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=57323ce547ed6f3abcb68de6354c64758faed2fd
commit 57323ce547ed6f3abcb68de6354c64758faed2fd
Merge: 69b867a 128f7e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 11 17:33:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 11 17:33:34 2015 -0400

    Merge topic 'fix-makefile-progress' into next
    
    128f7e34 cmLocalGenerator: Always return the end snapshot state of a directory.
    3f4e5e8c cmState: Return end snapshot for GetBuildsystemDirectoryParent.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=128f7e34e99de725b7750531d9285763818e58ab
commit 128f7e34e99de725b7750531d9285763818e58ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 1 18:46:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 23:32:22 2015 +0200

    cmLocalGenerator: Always return the end snapshot state of a directory.
    
    This is needed for proper makefile progress tracking.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b360c22..46d5cd8 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -487,7 +487,7 @@ cmState* cmLocalGenerator::GetState() const
 
 cmState::Snapshot cmLocalGenerator::GetStateSnapshot() const
 {
-  return this->StateSnapshot;
+  return this->Makefile->GetStateSnapshot();
 }
 
 // List of variables that are replaced when

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15
commit 3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 1 18:37:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 23:17:27 2015 +0200

    cmState: Return end snapshot for GetBuildsystemDirectoryParent.
    
    This is the appropriate snapshot for future use.  Existing users
    of this method are mostly just calling GetDirectory on the result,
    but the progress tracking of the Makefile generator needs a consistent
    snapshot to be used, so the end snapshot should be consistently used.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index b30c10b..63909ab 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1067,7 +1067,8 @@ cmState::Snapshot cmState::Snapshot::GetBuildsystemDirectoryParent() const
   PositionType parentPos = this->Position->DirectoryParent;
   if (parentPos != this->State->SnapshotData.Root())
     {
-    snapshot = Snapshot(this->State, parentPos);
+    snapshot = Snapshot(this->State,
+                        parentPos->BuildSystemDirectory->DirectoryEnd);
     }
 
   return snapshot;

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 +-
 Source/cmState.cxx          |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake