summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-10-15 22:37:15 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-10-15 22:37:15 (GMT)
commit1830690a0dc0719922bd7cb51dc8502d884c873e (patch)
treec9283bcc735a280ddd794bcea8ee8a59108d73c7
parent7d907c8d598d582694545f120c4da11df9538174 (diff)
downloadCMake-1830690a0dc0719922bd7cb51dc8502d884c873e.zip
CMake-1830690a0dc0719922bd7cb51dc8502d884c873e.tar.gz
CMake-1830690a0dc0719922bd7cb51dc8502d884c873e.tar.bz2
ENH: expand variables in message command output
-rw-r--r--Source/cmMessageCommand.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index bb28eab..157a7ee 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -49,7 +49,8 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
this->SetError("called with incorrect number of arguments");
return false;
}
-
+ std::string arg0 = args[0];
+ m_Makefile->ExpandVariablesInString(arg0);
if (args.size() >= 2)
{
std::string message;
@@ -59,11 +60,12 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
{
message += *i;
}
- cmSystemTools::Message(args[0].c_str(), message.c_str());
+ m_Makefile->ExpandVariablesInString(message);
+ cmSystemTools::Message(arg0.c_str(), message.c_str());
}
else
{
- cmSystemTools::Message(args[0].c_str());
+ cmSystemTools::Message(arg0.c_str());
}
return true;