Commit 1830690a authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: expand variables in message command output

parent 7d907c8d
...@@ -49,7 +49,8 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args) ...@@ -49,7 +49,8 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
this->SetError("called with incorrect number of arguments"); this->SetError("called with incorrect number of arguments");
return false; return false;
} }
std::string arg0 = args[0];
m_Makefile->ExpandVariablesInString(arg0);
if (args.size() >= 2) if (args.size() >= 2)
{ {
std::string message; std::string message;
...@@ -59,11 +60,12 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args) ...@@ -59,11 +60,12 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
{ {
message += *i; message += *i;
} }
cmSystemTools::Message(args[0].c_str(), message.c_str()); m_Makefile->ExpandVariablesInString(message);
cmSystemTools::Message(arg0.c_str(), message.c_str());
} }
else else
{ {
cmSystemTools::Message(args[0].c_str()); cmSystemTools::Message(arg0.c_str());
} }
return true; return true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment