From 0314c5f76aec4a17fe7ddf6a7485d001b71935c8 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 7 Nov 2001 12:23:27 -0500 Subject: Allow multiline messages --- Source/cmMessageCommand.cxx | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index 157a7ee..d7ae465 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -49,25 +49,14 @@ bool cmMessageCommand::InitialPass(std::vector 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; + std::vector::const_iterator i = args.begin(); + for(;i != args.end(); ++i) { - std::string message; - std::vector::const_iterator i = args.begin(); - ++i; - for(;i != args.end(); ++i) - { - message += *i; - } - m_Makefile->ExpandVariablesInString(message); - cmSystemTools::Message(arg0.c_str(), message.c_str()); + message += *i; } - else - { - cmSystemTools::Message(arg0.c_str()); - } - + m_Makefile->ExpandVariablesInString(message); + cmSystemTools::Message(message.c_str()); return true; } -- cgit v0.12