CMake: Allow override of unexpected non-flow-control commands

Fixes: #22310

1 files changed, 8 insertions, 1 deletions

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index d97762bb6c..929b0fba96 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -480,7 +480,7 @@ void cmState::AddDisallowedCommand(std::string const& name,
 
 void cmState::AddUnexpectedCommand(std::string const& name, const char* error)
 {
-  this->AddFlowControlCommand(
+  this->AddBuiltinCommand(
     name,
     [name, error](std::vector<cmListFileArgument> const&,
                   cmExecutionStatus& status) -> bool {
@@ -495,6 +495,13 @@ void cmState::AddUnexpectedCommand(std::string const& name, const char* error)
     });
 }
 
+void cmState::AddUnexpectedFlowControlCommand(std::string const& name,
+                                              const char* error)
+{
+  this->FlowControlCommands.insert(name);
+  this->AddUnexpectedCommand(name, error);
+}
+
 bool cmState::AddScriptedCommand(std::string const& name, BT<Command> command,
                                  cmMakefile& mf)
 {