|
|
@@ -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;
|
|
|
}
|