diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-14 13:19:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-14 13:19:51 (GMT) |
| commit | 8af34749fe95e03596db0fd79184e2adf8d8b1fb (patch) | |
| tree | f39771e7e93c56f6d07d983847387d9454ab30d1 | |
| parent | f844993c243ae271469d33347402bf3174dff683 (diff) | |
| parent | 5d6aa3648bb6d8f3be320fc08e16e810a782c054 (diff) | |
| download | CMake-8af34749fe95e03596db0fd79184e2adf8d8b1fb.zip CMake-8af34749fe95e03596db0fd79184e2adf8d8b1fb.tar.gz CMake-8af34749fe95e03596db0fd79184e2adf8d8b1fb.tar.bz2 | |
Merge topic 'fix-makefile-progress'
5d6aa364 cmLocalGenerator: Always return the end snapshot state of a directory.
3f4e5e8c cmState: Return end snapshot for GetBuildsystemDirectoryParent.
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmState.cxx | 3 |
2 files changed, 3 insertions, 2 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 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; |