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

Fix the path detection to work for top-level

Browse Source
This commit is contained in:
Ben Boeckel 2010-09-22 12:41:58 -04:00
parent 62be1f78ae
commit cbb286c0b2
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmMakefile.cxx
View File

@ -1774,17 +1774,30 @@ bool cmMakefile::VariableUsed(const char* var) const
void cmMakefile::CheckForUnused(const char* reason, const char* name) const void cmMakefile::CheckForUnused(const char* reason, const char* name) const
{ {
if (this->WarnUnused && !this->VariableUsed(name) && this->CallStack.size()) if (this->WarnUnused && !this->VariableUsed(name))
{ {
const cmListFileContext* file = this->CallStack.back().Context; cmStdString path;
int line;
if (this->CallStack.size())
{
const cmListFileContext* file = this->CallStack.back().Context;
path = file->FilePath.c_str();
line = file->Line;
}
else
{
path = this->GetStartDirectory();
path += "/CMakeLists.txt";
line = 0;
}
if (this->CheckSystemVars || if (this->CheckSystemVars ||
cmSystemTools::IsSubDirectory(file->FilePath.c_str(), cmSystemTools::IsSubDirectory(path.c_str(),
this->GetHomeDirectory()) || this->GetHomeDirectory()) ||
cmSystemTools::IsSubDirectory(file->FilePath.c_str(), cmSystemTools::IsSubDirectory(path.c_str(),
this->GetHomeOutputDirectory())) this->GetHomeOutputDirectory()))
{ {
cmOStringStream msg; cmOStringStream msg;
msg << file->FilePath << ":" << file->Line << ":" << msg << path << ":" << line << ":" <<
" warning: (" << reason << ") unused variable \'" << name << "\'"; " warning: (" << reason << ") unused variable \'" << name << "\'";
cmSystemTools::Message(msg.str().c_str()); cmSystemTools::Message(msg.str().c_str());
} }