mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-16 23:41:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmState::AddDisallowedCommand(): Allow additional warning info

Browse Source
This commit is contained in:
Kyle Edwards
2023-10-27 09:32:48 -04:00
parent e3747a2d4b
commit 8313d26198
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmState.cxx
View File

@@ -447,17 +447,23 @@ void cmState::AddFlowControlCommand(std::string const& name,
void cmState::AddDisallowedCommand(std::string const& name,
BuiltinCommand command,
cmPolicies::PolicyID policy,
const char* message)
const char* message,
const char* additionalWarning)
{
this->AddBuiltinCommand(
name,
[command, policy, message](const std::vector<cmListFileArgument>& args,
cmExecutionStatus& status) -> bool {
[command, policy, message,
additionalWarning](const std::vector<cmListFileArgument>& args,
cmExecutionStatus& status) -> bool {
cmMakefile& mf = status.GetMakefile();
switch (mf.GetPolicyStatus(policy)) {
case cmPolicies::WARN:
mf.IssueMessage(MessageType::AUTHOR_WARNING,
cmPolicies::GetPolicyWarning(policy));
case cmPolicies::WARN: {
std::string warning = cmPolicies::GetPolicyWarning(policy);
if (additionalWarning) {
warning = cmStrCat(warning, '\n', additionalWarning);
}
mf.IssueMessage(MessageType::AUTHOR_WARNING, warning);
}
CM_FALLTHROUGH;
case cmPolicies::OLD:
break;

3
Source/cmState.h
View File

@@ -183,7 +183,8 @@ public:
void AddFlowControlCommand(std::string const& name, Command command);
void AddFlowControlCommand(std::string const& name, BuiltinCommand command);
void AddDisallowedCommand(std::string const& name, BuiltinCommand command,
cmPolicies::PolicyID policy, const char* message);
cmPolicies::PolicyID policy, const char* message,
const char* additionalWarning = nullptr);
void AddUnexpectedCommand(std::string const& name, const char* error);
void AddUnexpectedFlowControlCommand(std::string const& name,
const char* error);