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

cmMakefile: Don't pop the directory listfile off the stack. 

Simplify the IssueMessage implementation.
This commit is contained in:
Stephen Kelly 2015-05-23 11:06:54 +02:00
parent e40fcb598d
commit f5b0a0fba4
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmMakefile.cxx
View File

@ -260,18 +260,10 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
else else
{ {
cmListFileContext lfc; cmListFileContext lfc;
if(this->ListFileStack.empty()) // We are not currently executing a command. Add whatever context
{ // information we have.
// We are not processing the project. Add the directory-level context.
lfc.FilePath = this->GetCurrentSourceDirectory();
lfc.FilePath += "/CMakeLists.txt";
}
else
{
// We are processing the project but are not currently executing a
// command. Add whatever context information we have.
lfc.FilePath = this->ListFileStack.back(); lfc.FilePath = this->ListFileStack.back();
}
if(!this->GetCMakeInstance()->GetIsInTryCompile()) if(!this->GetCMakeInstance()->GetIsInTryCompile())
{ {
lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath, lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath,
@ -535,12 +527,16 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->AddDefinition("CMAKE_PARENT_LIST_FILE",
this->GetDefinition("CMAKE_CURRENT_LIST_FILE")); this->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
return this->ReadListFile(listfile, noPolicyScope, false); bool result = this->ReadListFile(listfile, noPolicyScope, false);
this->ListFileStack.pop_back();
return result;
} }
bool cmMakefile::ReadListFile(const char* listfile) bool cmMakefile::ReadListFile(const char* listfile)
{ {
return this->ReadListFile(listfile, true, false); bool result = this->ReadListFile(listfile, true, false);
this->ListFileStack.pop_back();
return result;
} }
bool cmMakefile::ReadListFile(const char* listfile, bool cmMakefile::ReadListFile(const char* listfile,
@ -577,8 +573,6 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
this->ListFileStack.pop_back();
if (res) if (res)
{ {
this->CheckForUnusedVariables(); this->CheckForUnusedVariables();