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

Merge topic 'fix-makefile-progress'

Browse Source 
5d6aa364 cmLocalGenerator: Always return the end snapshot state of a directory.
3f4e5e8c cmState: Return end snapshot for GetBuildsystemDirectoryParent.
This commit is contained in:
Brad King 2015-09-14 09:19:51 -04:00 committed by CMake Topic Stage
commit 8af34749fe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@ -487,7 +487,7 @@ cmState* cmLocalGenerator::GetState() const
cmState::Snapshot cmLocalGenerator::GetStateSnapshot() const cmState::Snapshot cmLocalGenerator::GetStateSnapshot() const
{ {
return this->StateSnapshot; return this->Makefile->GetStateSnapshot();
} }
// List of variables that are replaced when // List of variables that are replaced when

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;