diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-25 14:23:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-25 14:23:13 (GMT) |
| commit | 9ecf8a14fb4a12178a7bb97a87dee3fada3204d5 (patch) | |
| tree | 5dd0c3e19d91a3fecfffca3b27280e9691079cb6 /Source | |
| parent | c25d642de38730cdb6627a2c2d47f85e8c470974 (diff) | |
| parent | 62126b67e0048800a833d3c4ea86d2307f1a4a06 (diff) | |
| download | CMake-9ecf8a14fb4a12178a7bb97a87dee3fada3204d5.zip CMake-9ecf8a14fb4a12178a7bb97a87dee3fada3204d5.tar.gz CMake-9ecf8a14fb4a12178a7bb97a87dee3fada3204d5.tar.bz2 | |
Merge branch 'fix-find_package-version-file-error-stack' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmState.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index ce9ff32..363d2bf 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1081,7 +1081,8 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent() const Snapshot snapshot; PositionType parentPos = this->Position; - while(parentPos->SnapshotType == cmState::PolicyScopeType) + while (parentPos->SnapshotType == cmState::PolicyScopeType || + parentPos->SnapshotType == cmState::VariableScopeType) { ++parentPos; } @@ -1092,7 +1093,8 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent() const } ++parentPos; - while(parentPos->SnapshotType == cmState::PolicyScopeType) + while (parentPos->SnapshotType == cmState::PolicyScopeType || + parentPos->SnapshotType == cmState::VariableScopeType) { ++parentPos; } |