diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-25 14:21:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-25 14:21:49 (GMT) |
| commit | 99533c8e345c627f5f5a98be5cda7b7624756fb9 (patch) | |
| tree | 816552f1d75fba5e698b59e39543da2f760561db /Source | |
| parent | 2b24fbf48ce00777738c306354c8c7ec2cb3237b (diff) | |
| parent | 62126b67e0048800a833d3c4ea86d2307f1a4a06 (diff) | |
| download | CMake-99533c8e345c627f5f5a98be5cda7b7624756fb9.zip CMake-99533c8e345c627f5f5a98be5cda7b7624756fb9.tar.gz CMake-99533c8e345c627f5f5a98be5cda7b7624756fb9.tar.bz2 | |
Merge topic 'fix-find_package-version-file-error-stack'
62126b67 Merge branch 'test-cmake_policy-unmatched' into fix-find_package-version-file-error-stack
2e28c619 cmState: Skip variable scope snapshots to avoid call stack duplicates
b219ff94 Tests: Add case for package version file unmatched policy scope
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 c491c7d..4362157 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1156,7 +1156,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; } @@ -1167,7 +1168,8 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent() const } ++parentPos; - while(parentPos->SnapshotType == cmState::PolicyScopeType) + while (parentPos->SnapshotType == cmState::PolicyScopeType || + parentPos->SnapshotType == cmState::VariableScopeType) { ++parentPos; } |