diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-21 13:16:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-21 13:16:49 (GMT) |
| commit | e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (patch) | |
| tree | dc99dc7c2fdfc9d49ef71c78290afbaf9a3a64d1 /Source/cmMakefile.cxx | |
| parent | f1de724f41a516574f22d2b0e61ebf4b6d65c601 (diff) | |
| parent | d6a03b475e023da9b7532a5b8735caec36b5de86 (diff) | |
| download | CMake-e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5.zip CMake-e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5.tar.gz CMake-e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5.tar.bz2 | |
Merge topic 'fix-CMP0054-elseif-warning'
d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a1f143a..264b169 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4569,9 +4569,10 @@ bool cmMakefile::SetPolicyVersion(const char *version) } //---------------------------------------------------------------------------- -bool cmMakefile::HasCMP0054AlreadyBeenReported() const +bool cmMakefile::HasCMP0054AlreadyBeenReported( + cmListFileContext const& context) const { - return !this->CMP0054ReportedIds.insert(this->GetExecutionContext()).second; + return !this->CMP0054ReportedIds.insert(context).second; } //---------------------------------------------------------------------------- |