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

define_property(): Only test prefix if INITIALIZE_FROM_VARIABLE is given

Browse Source
This commit is contained in:
Craig Scott 2022-03-19 17:03:26 +11:00
parent 9b50f221f6
commit 87c3b5e421
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmDefinePropertyCommand.cxx
View File

@ -97,20 +97,20 @@ bool cmDefinePropertyCommand(std::vector<std::string> const& args,
PropertyName, "\""));
return false;
}
}
// Make sure the variable is not reserved.
static constexpr const char* reservedPrefixes[] = {
"CMAKE_",
"_CMAKE_",
};
if (std::any_of(std::begin(reservedPrefixes), std::end(reservedPrefixes),
[&initializeFromVariable](const char* prefix) {
return cmHasPrefix(initializeFromVariable, prefix);
})) {
status.SetError(
cmStrCat("variable name \"", initializeFromVariable, "\" is reserved"));
return false;
// Make sure the variable is not reserved.
static constexpr const char* reservedPrefixes[] = {
"CMAKE_",
"_CMAKE_",
};
if (std::any_of(std::begin(reservedPrefixes), std::end(reservedPrefixes),
[&initializeFromVariable](const char* prefix) {
return cmHasPrefix(initializeFromVariable, prefix);
})) {
status.SetError(cmStrCat("variable name \"", initializeFromVariable,
"\" is reserved"));
return false;
}
}
// Actually define the property.