summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-15 14:13:12 (GMT)
committerBrad King <brad.king@kitware.com>2016-04-15 14:13:12 (GMT)
commit2faa8b362050c716cc5626f9bb9d8a8612b97f95 (patch)
treec00fab30e02021d6a3c232db009cc02c7106d5d8 /Source/cmMakefile.cxx
parentda07c506b9044e89ad9d904450aa590bb260bd78 (diff)
downloadCMake-2faa8b362050c716cc5626f9bb9d8a8612b97f95.zip
CMake-2faa8b362050c716cc5626f9bb9d8a8612b97f95.tar.gz
CMake-2faa8b362050c716cc5626f9bb9d8a8612b97f95.tar.bz2
Add call stack to unused/uninitialized variable warnings
In commit v2.8.4~32^2~14 (Use cmake::IssueMessage for warnings, 2010-12-07) these warnings became formatted. It is more informative to give the full call stack with such warnings. Also it is easier to implement warnings with a full call stack because we do not have to construct a custom backtrace with only the top.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx20
1 files changed, 3 insertions, 17 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 162d3e7..13bcdac 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1961,21 +1961,15 @@ void cmMakefile::LogUnused(const char* reason,
if (this->WarnUnused)
{
std::string path;
- cmListFileContext lfc;
if (!this->ExecutionStatusStack.empty())
{
- lfc = this->GetExecutionContext();
- path = lfc.FilePath;
+ path = this->GetExecutionContext().FilePath;
}
else
{
path = this->GetCurrentSourceDirectory();
path += "/CMakeLists.txt";
- lfc.FilePath = path;
- lfc.Line = 0;
}
- cmOutputConverter converter(this->StateSnapshot);
- lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
if (this->CheckSystemVars ||
cmSystemTools::IsSubDirectory(path,
@@ -1987,9 +1981,7 @@ void cmMakefile::LogUnused(const char* reason,
{
std::ostringstream msg;
msg << "unused variable (" << reason << ") \'" << name << "\'";
- this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
- msg.str(),
- lfc);
+ this->IssueMessage(cmake::AUTHOR_WARNING, msg.str());
}
}
}
@@ -2919,14 +2911,8 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
this->GetHomeOutputDirectory()))
{
std::ostringstream msg;
- cmListFileContext lfc;
- cmOutputConverter converter(this->StateSnapshot);
- lfc.FilePath =
- converter.Convert(filename, cmOutputConverter::HOME);
- lfc.Line = line;
msg << "uninitialized variable \'" << lookup << "\'";
- this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
- msg.str(), lfc);
+ this->IssueMessage(cmake::AUTHOR_WARNING, msg.str());
}
}
}