summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-09-01 16:46:05 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-09-12 12:09:00 (GMT)
commit5d6aa3648bb6d8f3be320fc08e16e810a782c054 (patch)
treeac95f6644cfa2709a33798bac12f30ec84eb23a7
parent3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15 (diff)
downloadCMake-5d6aa3648bb6d8f3be320fc08e16e810a782c054.zip
CMake-5d6aa3648bb6d8f3be320fc08e16e810a782c054.tar.gz
CMake-5d6aa3648bb6d8f3be320fc08e16e810a782c054.tar.bz2
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.
-rw-r--r--Source/cmLocalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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