diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-01 16:37:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-11 21:17:27 (GMT) |
| commit | 3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15 (patch) | |
| tree | ae2248bc8fe376af4b54cda2ea5018bd63d03e86 | |
| parent | 8e8824149fb6525f1a6da5f9c825a67765ce240b (diff) | |
| download | CMake-3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15.zip CMake-3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15.tar.gz CMake-3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmState.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |