kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Stephen Kelly 2015-09-01 18:37:33 +02:00
parent 8e8824149f
commit 3f4e5e8c3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmState.cxx
View File

@ -1067,7 +1067,8 @@ cmState::Snapshot cmState::Snapshot::GetBuildsystemDirectoryParent() const
PositionType parentPos = this->Position->DirectoryParent; PositionType parentPos = this->Position->DirectoryParent;
if (parentPos != this->State->SnapshotData.Root()) if (parentPos != this->State->SnapshotData.Root())
{ {
snapshot = Snapshot(this->State, parentPos); snapshot = Snapshot(this->State,
parentPos->BuildSystemDirectory->DirectoryEnd);
} }
return snapshot; return snapshot;