|
|
@@ -2,22 +2,22 @@
|
|
|
file Copyright.txt or https://cmake.org/licensing for details. */
|
|
|
#include "cmIncludeRegularExpressionCommand.h"
|
|
|
|
|
|
+#include "cmExecutionStatus.h"
|
|
|
#include "cmMakefile.h"
|
|
|
|
|
|
-class cmExecutionStatus;
|
|
|
-
|
|
|
-// cmIncludeRegularExpressionCommand
|
|
|
-bool cmIncludeRegularExpressionCommand::InitialPass(
|
|
|
- std::vector<std::string> const& args, cmExecutionStatus&)
|
|
|
+bool cmIncludeRegularExpressionCommand(std::vector<std::string> const& args,
|
|
|
+ cmExecutionStatus& status)
|
|
|
{
|
|
|
- if ((args.empty()) || (args.size() > 2)) {
|
|
|
- this->SetError("called with incorrect number of arguments");
|
|
|
+ if (args.empty() || args.size() > 2) {
|
|
|
+ status.SetError("called with incorrect number of arguments");
|
|
|
return false;
|
|
|
}
|
|
|
- this->Makefile->SetIncludeRegularExpression(args[0].c_str());
|
|
|
+
|
|
|
+ cmMakefile& mf = status.GetMakefile();
|
|
|
+ mf.SetIncludeRegularExpression(args[0].c_str());
|
|
|
|
|
|
if (args.size() > 1) {
|
|
|
- this->Makefile->SetComplainRegularExpression(args[1]);
|
|
|
+ mf.SetComplainRegularExpression(args[1]);
|
|
|
}
|
|
|
|
|
|
return true;
|