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

ENH: In cmMakefile::IssueMessage report the directory-level context even if no list file is currently being processed.

Browse Source
This commit is contained in:
Brad King 2008-04-29 14:17:28 -04:00
parent 2421c11a98
commit fb8c255c2d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmMakefile.cxx
View File

@ -299,12 +299,21 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
} }
this->GetBacktrace(backtrace); this->GetBacktrace(backtrace);
} }
else if(!this->ListFileStack.empty()) else
{ {
// We are processing the project but are not currently executing a
// command. Add whatever context information we have.
cmListFileContext lfc; cmListFileContext lfc;
lfc.FilePath = this->ListFileStack.back(); if(this->ListFileStack.empty())
{
// We are not processing the project. Add the directory-level context.
lfc.FilePath = this->GetCurrentDirectory();
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.Line = 0; lfc.Line = 0;
if(!this->GetCMakeInstance()->GetIsInTryCompile()) if(!this->GetCMakeInstance()->GetIsInTryCompile())
{ {