echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: also handle comments for variables which contain newlines

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-06-01 11:06:48 -04:00
parent 8cba2c55f9
commit 26a5a295eb
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmCacheManager.cxx
View File

@ -224,7 +224,15 @@ bool cmCacheManager::LoadCache(const char* path,
} }
while(realbuffer[0] == '/' && realbuffer[1] == '/') while(realbuffer[0] == '/' && realbuffer[1] == '/')
{ {
e.Properties["HELPSTRING"] += &realbuffer[2]; if ((realbuffer[2] == '\\') && (realbuffer[3]=='n'))
{
e.Properties["HELPSTRING"] += "\n";
e.Properties["HELPSTRING"] += &realbuffer[4];
}
else
{
e.Properties["HELPSTRING"] += &realbuffer[2];
}
cmSystemTools::GetLineFromStream(fin, buffer); cmSystemTools::GetLineFromStream(fin, buffer);
realbuffer = buffer.c_str(); realbuffer = buffer.c_str();
if(!fin) if(!fin)
@ -657,27 +665,22 @@ void cmCacheManager::OutputHelpString(std::ofstream& fout,
} }
std::string oneLine; std::string oneLine;
std::string::size_type pos = 0; std::string::size_type pos = 0;
std::string::size_type nextBreak = 60; for (std::string::size_type i=0; i<=end; i++)
bool done = false;
while(!done)
{ {
if(nextBreak >= end) if ((i==end)
|| (helpString[i]=='\n')
|| ((i-pos >= 60) && (helpString[i]==' ')))
{ {
nextBreak = end; fout << "//";
done = true; if (helpString[pos] == '\n')
}
else
{
while(nextBreak < end && helpString[nextBreak] != ' ')
{ {
nextBreak++; pos++;
fout << "\\n";
} }
oneLine = helpString.substr(pos, i - pos);
fout << oneLine.c_str() << "\n";
pos = i;
} }
oneLine = helpString.substr(pos, nextBreak - pos);
fout << "//" << oneLine.c_str() << "\n";
pos = nextBreak;
nextBreak += 60;
} }
} }