diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-12 10:52:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-18 13:52:05 (GMT) |
| commit | fcea4a3b452c5126d826610f73fb669c2e600726 (patch) | |
| tree | 20865a060120ce7acfea800bf972cb204d8559f6 | |
| parent | 0a7a4665beaa5a8af42995410e590bc0731d6748 (diff) | |
| download | CMake-fcea4a3b452c5126d826610f73fb669c2e600726.zip CMake-fcea4a3b452c5126d826610f73fb669c2e600726.tar.gz CMake-fcea4a3b452c5126d826610f73fb669c2e600726.tar.bz2 | |
cmStateSnapshot: Invert CanPopPolicyScope return value to match name
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmStateSnapshot.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 1f1c06a..3c1cba2 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4605,7 +4605,7 @@ void cmMakefile::PopSnapshot(bool reportError) // cmStateSnapshot manages nested policy scopes within it. // Since the scope corresponding to the snapshot is closing, // reject any still-open nested policy scopes with an error. - while (!this->StateSnapshot.CanPopPolicyScope()) { + while (this->StateSnapshot.CanPopPolicyScope()) { if (reportError) { this->IssueMessage(MessageType::FATAL_ERROR, "cmake_policy PUSH without matching POP"); diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index c223431..15a98af 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -148,7 +148,7 @@ bool cmStateSnapshot::PopPolicy() bool cmStateSnapshot::CanPopPolicyScope() { - return this->Position->Policies == this->Position->PolicyScope; + return this->Position->Policies != this->Position->PolicyScope; } void cmStateSnapshot::SetPolicy(cmPolicies::PolicyID id, |