mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 00:11:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Simplify -W recognition of no- and error= prefixes

Browse Source
This commit is contained in:
Brad King
2020-11-10 11:28:30 -05:00
parent 98290782b6
commit 7302a23a1f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmake.cxx
View File

@@ -527,28 +527,26 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
return true;
};
auto WarningLambda = [](std::string const& entry, cmake* state) -> bool {
std::string name;
auto WarningLambda = [](cm::string_view entry, cmake* state) -> bool {
bool foundNo = false;
bool foundError = false;
unsigned int nameStartPosition = 0;
if (entry.find("no-", nameStartPosition) == nameStartPosition) {
if (cmHasLiteralPrefix(entry, "no-")) {
foundNo = true;
nameStartPosition += 3;
entry.remove_prefix(3);
}
if (entry.find("error=", nameStartPosition) == nameStartPosition) {
if (cmHasLiteralPrefix(entry, "error=")) {
foundError = true;
nameStartPosition += 6;
entry.remove_prefix(6);
}
name = entry.substr(nameStartPosition);
if (name.empty()) {
if (entry.empty()) {
cmSystemTools::Error("No warning name provided.");
return false;
}
std::string const name = std::string(entry);
if (!foundNo && !foundError) {
// -W<name>
state->DiagLevels[name] = std::max(state->DiagLevels[name], DIAG_WARN);