[Cmake-commits] CMake branch, next, updated. v3.3.1-2883-gf8aeb20

[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  f8aeb20b2c7da9b67adc960d44d0f7ce588d8b7c (commit)
       via  5d6aa3648bb6d8f3be320fc08e16e810a782c054 (commit)
      from  57323ce547ed6f3abcb68de6354c64758faed2fd (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=f8aeb20b2c7da9b67adc960d44d0f7ce588d8b7c
commit f8aeb20b2c7da9b67adc960d44d0f7ce588d8b7c
Merge: 57323ce 5d6aa36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 08:10:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 12 08:10:22 2015 -0400

    Merge topic 'fix-makefile-progress' into next
    
    5d6aa364 cmLocalGenerator: Always return the end snapshot state of a directory.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d6aa3648bb6d8f3be320fc08e16e810a782c054
commit 5d6aa3648bb6d8f3be320fc08e16e810a782c054
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 1 18:46:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 12 14:09:00 2015 +0200

    cmLocalGenerator: Always return the end snapshot state of a directory.
    
    This is needed for proper makefile progress tracking.
    
    The cmLocalGenerator is constructed at configure-time, but only used
    at generate time.  The StateSnapshot member is currently populated
    before configuring, so use the Makefile to get the end snapshot.

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

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

Summary of changes:


hooks/post-receive
-- 
CMake