diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-19 12:23:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-19 12:23:08 (GMT) |
| commit | 3c6388553aef091556b64daf9bcb6f64fbdcdba2 (patch) | |
| tree | 66c10261df25155548db1db3d4568ad29157c80c /Source/cmStateSnapshot.cxx | |
| parent | 6c13ddd6cb0c51afd2789db34b41416b5706336b (diff) | |
| parent | a61ae3fb8017a297bd3f3efc447a1f1f29619bdf (diff) | |
| download | CMake-3c6388553aef091556b64daf9bcb6f64fbdcdba2.zip CMake-3c6388553aef091556b64daf9bcb6f64fbdcdba2.tar.gz CMake-3c6388553aef091556b64daf9bcb6f64fbdcdba2.tar.bz2 | |
Merge topic 'CheckIncludeFile-required-libs'
a61ae3fb80 CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES
391a5837ee cmake_policy: Add undocumented PARENT_SCOPE option to GET
3c47ac5b25 OpenWatcom: Add workaround for lack of error on missing library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1978
Diffstat (limited to 'Source/cmStateSnapshot.cxx')
| -rw-r--r-- | Source/cmStateSnapshot.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index 0d97c33..0229a77 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -160,8 +160,8 @@ void cmStateSnapshot::SetPolicy(cmPolicies::PolicyID id, } } -cmPolicies::PolicyStatus cmStateSnapshot::GetPolicy( - cmPolicies::PolicyID id) const +cmPolicies::PolicyStatus cmStateSnapshot::GetPolicy(cmPolicies::PolicyID id, + bool parent_scope) const { cmPolicies::PolicyStatus status = cmPolicies::GetPolicyStatus(id); @@ -180,6 +180,10 @@ cmPolicies::PolicyStatus cmStateSnapshot::GetPolicy( cmLinkedTree<cmStateDetail::PolicyStackEntry>::iterator root = dir->DirectoryEnd->PolicyRoot; for (; leaf != root; ++leaf) { + if (parent_scope) { + parent_scope = false; + continue; + } if (leaf->IsDefined(id)) { status = leaf->Get(id); return status; |