From b46970cfe9e0c96a9794acb49fc580565bcd6e91 Mon Sep 17 00:00:00 2001
From: Regina Pfeifer <regina@mailbox.org>
Date: Thu, 12 Sep 2019 10:14:27 +0200
Subject: cmGetTestPropertyCommand: Port away from cmCommand

Ref: #19499
---
 Source/cmCommands.cxx               |  3 +--
 Source/cmGetTestPropertyCommand.cxx | 17 ++++++++---------
 Source/cmGetTestPropertyCommand.h   | 21 ++-------------------
 3 files changed, 11 insertions(+), 30 deletions(-)

(limited to 'Source')

diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 9916282a63..2bdddc926e 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -230,8 +230,7 @@ void GetProjectCommands(cmState* state)
   state->AddBuiltinCommand("get_source_file_property",
                            cmGetSourceFilePropertyCommand);
   state->AddBuiltinCommand("get_target_property", cmGetTargetPropertyCommand);
-  state->AddBuiltinCommand("get_test_property",
-                           cm::make_unique<cmGetTestPropertyCommand>());
+  state->AddBuiltinCommand("get_test_property", cmGetTestPropertyCommand);
   state->AddBuiltinCommand("include_directories",
                            cm::make_unique<cmIncludeDirectoryCommand>());
   state->AddBuiltinCommand(
diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx
index 0b0d6eb3de..cf8c1d5faa 100644
--- a/Source/cmGetTestPropertyCommand.cxx
+++ b/Source/cmGetTestPropertyCommand.cxx
@@ -2,33 +2,32 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGetTestPropertyCommand.h"
 
+#include "cmExecutionStatus.h"
 #include "cmMakefile.h"
 #include "cmTest.h"
 
-class cmExecutionStatus;
-
-// cmGetTestPropertyCommand
-bool cmGetTestPropertyCommand::InitialPass(
-  std::vector<std::string> const& args, cmExecutionStatus&)
+bool cmGetTestPropertyCommand(std::vector<std::string> const& args,
+                              cmExecutionStatus& status)
 {
   if (args.size() < 3) {
-    this->SetError("called with incorrect number of arguments");
+    status.SetError("called with incorrect number of arguments");
     return false;
   }
 
   std::string const& testName = args[0];
   std::string const& var = args[2];
-  cmTest* test = this->Makefile->GetTest(testName);
+  cmMakefile& mf = status.GetMakefile();
+  cmTest* test = mf.GetTest(testName);
   if (test) {
     const char* prop = nullptr;
     if (!args[1].empty()) {
       prop = test->GetProperty(args[1]);
     }
     if (prop) {
-      this->Makefile->AddDefinition(var, prop);
+      mf.AddDefinition(var, prop);
       return true;
     }
   }
-  this->Makefile->AddDefinition(var, "NOTFOUND");
+  mf.AddDefinition(var, "NOTFOUND");
   return true;
 }
diff --git a/Source/cmGetTestPropertyCommand.h b/Source/cmGetTestPropertyCommand.h
index a53a7f7448..30beb8f0f6 100644
--- a/Source/cmGetTestPropertyCommand.h
+++ b/Source/cmGetTestPropertyCommand.h
@@ -8,26 +8,9 @@
 #include <string>
 #include <vector>
 
-#include "cm_memory.hxx"
-
-#include "cmCommand.h"
-
 class cmExecutionStatus;
 
-class cmGetTestPropertyCommand : public cmCommand
-{
-public:
-  std::unique_ptr<cmCommand> Clone() override
-  {
-    return cm::make_unique<cmGetTestPropertyCommand>();
-  }
-
-  /**
-   * This is called when the command is first encountered in
-   * the input file.
-   */
-  bool InitialPass(std::vector<std::string> const& args,
-                   cmExecutionStatus& status) override;
-};
+bool cmGetTestPropertyCommand(std::vector<std::string> const& args,
+                              cmExecutionStatus& status);
 
 #endif
-- 
cgit v1.2.1