echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmMessageCommand: Remove extra layer of parentheses

Browse Source 
The logic checking `CMAKE_WARN_DEPRECATED` contained an unnecessary
layer of parentheses.  The condition is of the form `!IsSet || IsOn`
which is correct because the documentation says that the behavior is
enabled unless the variable is explicitly set to a false value.

Issue: #19610
This commit is contained in:
Brad King 2019-08-22 11:26:35 -04:00
parent b1cfaf7b91
commit 51565abe79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMessageCommand.cxx
View File

@ -70,8 +70,8 @@ bool cmMessageCommand(std::vector<std::string> const& args,
fatal = true; fatal = true;
type = MessageType::DEPRECATION_ERROR; type = MessageType::DEPRECATION_ERROR;
level = cmake::LogLevel::LOG_ERROR; level = cmake::LogLevel::LOG_ERROR;
} else if ((!status.GetMakefile().IsSet("CMAKE_WARN_DEPRECATED") || } else if (!status.GetMakefile().IsSet("CMAKE_WARN_DEPRECATED") ||
status.GetMakefile().IsOn("CMAKE_WARN_DEPRECATED"))) { status.GetMakefile().IsOn("CMAKE_WARN_DEPRECATED")) {
type = MessageType::DEPRECATION_WARNING; type = MessageType::DEPRECATION_WARNING;
level = cmake::LogLevel::LOG_WARNING; level = cmake::LogLevel::LOG_WARNING;
} else { } else {