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

cmMakefile: Implement FormatListFileStack in terms of cmState.

This commit is contained in:
Stephen Kelly 2015-07-07 23:37:20 +02:00
parent a5412fbab4
commit 647b533bce
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmMakefile.cxx
View File

@ -4439,14 +4439,22 @@ void cmMakefile::AddCMakeDependFilesFromUser()
std::string cmMakefile::FormatListFileStack() const std::string cmMakefile::FormatListFileStack() const
{ {
std::vector<std::string> listFiles;
cmState::Snapshot snp = this->StateSnapshot;
while (snp.IsValid())
{
listFiles.push_back(snp.GetExecutionListFile());
snp = snp.GetCallStackParent();
}
std::reverse(listFiles.begin(), listFiles.end());
std::ostringstream tmp; std::ostringstream tmp;
size_t depth = this->ListFileStack.size(); size_t depth = listFiles.size();
if (depth > 0) if (depth > 0)
{ {
std::vector<std::string>::const_iterator it = this->ListFileStack.end(); std::vector<std::string>::const_iterator it = listFiles.end();
do do
{ {
if (depth != this->ListFileStack.size()) if (depth != listFiles.size())
{ {
tmp << "\n "; tmp << "\n ";
} }
@ -4457,7 +4465,7 @@ std::string cmMakefile::FormatListFileStack() const
tmp << *it; tmp << *it;
depth--; depth--;
} }
while (it != this->ListFileStack.begin()); while (it != listFiles.begin());
} }
return tmp.str(); return tmp.str();
} }