kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: In cmMakefile::IssueMessage use cmDocumentationFormatterText to format the message nicely.

This commit is contained in:
Brad King 2008-03-07 16:01:22 -05:00
parent 5233b75a77
commit d4f66dfa32
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDocumentationFormatterText.cxx
View File

@ -69,7 +69,7 @@ void cmDocumentationFormatterText::PrintPreformatted(std::ostream& os,
bool newline = true; bool newline = true;
for(const char* ptr = text; *ptr; ++ptr) for(const char* ptr = text; *ptr; ++ptr)
{ {
if(newline) if(newline && *ptr != '\n')
{ {
os << this->TextIndent; os << this->TextIndent;
newline = false; newline = false;

39
Source/cmMakefile.cxx
View File

@ -35,6 +35,8 @@
#include "cmake.h" #include "cmake.h"
#include <stdlib.h> // required for atoi #include <stdlib.h> // required for atoi
#include "cmDocumentationFormatterText.h"
#include <cmsys/RegularExpression.hxx> #include <cmsys/RegularExpression.hxx>
#include <cmsys/auto_ptr.hxx> #include <cmsys/auto_ptr.hxx>
@ -280,32 +282,6 @@ bool cmMakefile::CommandExists(const char* name) const
return this->GetCMakeInstance()->CommandExists(name); return this->GetCMakeInstance()->CommandExists(name);
} }
//----------------------------------------------------------------------------
// Helper function to print a block of text with every line following
// a given prefix.
void cmMakefilePrintPrefixed(std::ostream& os, const char* prefix,
std::string const& msg)
{
bool newline = true;
for(const char* c = msg.c_str(); *c; ++c)
{
if(newline && *c != '\n')
{
os << prefix;
newline = false;
}
os << *c;
if(*c == '\n')
{
newline = true;
}
}
if(!newline)
{
os << "\n";
}
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmMakefile::IssueError(std::string const& msg) const void cmMakefile::IssueError(std::string const& msg) const
{ {
@ -351,9 +327,13 @@ void cmMakefile::IssueMessage(std::string const& text, bool isError) const
} }
// Add the message text. // Add the message text.
{
msg << " {\n"; msg << " {\n";
cmMakefilePrintPrefixed(msg, " ", text); cmDocumentationFormatterText formatter;
formatter.SetIndent(" ");
formatter.PrintFormatted(msg, text.c_str());
msg << "}"; msg << "}";
}
// Add the rest of the context. // Add the rest of the context.
if(i != this->CallStack.rend()) if(i != this->CallStack.rend())
@ -3303,7 +3283,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
default: break; default: break;
} }
e << "created in source directory \"" e << "created in source directory \""
<< existing->GetMakefile()->GetCurrentDirectory() << "\".\n" << existing->GetMakefile()->GetCurrentDirectory() << "\"."
<< "\n"; << "\n";
e << e <<
"Logical target names must be globally unique because:\n" "Logical target names must be globally unique because:\n"
@ -3316,7 +3296,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
"Consider using the OUTPUT_NAME target property to create two " "Consider using the OUTPUT_NAME target property to create two "
"targets with the same physical name while keeping logical " "targets with the same physical name while keeping logical "
"names distinct. " "names distinct. "
"Custom targets must simply have globally unique names.\n" "Custom targets must simply have globally unique names."
"\n" "\n"
"If you are building an older project it is possible that " "If you are building an older project it is possible that "
"it violated this rule but was working accidentally because " "it violated this rule but was working accidentally because "
@ -3324,7 +3304,6 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
if(isCustom && existing->GetType() == cmTarget::UTILITY) if(isCustom && existing->GetType() == cmTarget::UTILITY)
{ {
e << e <<
"\n"
"For projects that care only about Makefile generators and do " "For projects that care only about Makefile generators and do "
"not wish to support Xcode or VS IDE generators, one may add\n" "not wish to support Xcode or VS IDE generators, one may add\n"
" set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)\n" " set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)\n"