echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmLocalGenerator: Store Backtrace for the directory

Browse Source 
Don't rely on cmMakefile to provide that.  Use it to issue messages.
This commit is contained in:
Stephen Kelly 2016-06-09 09:58:21 +02:00
parent acf0c0f444
commit 096c7754b3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmLocalGenerator.cxx
View File

@ -45,6 +45,7 @@
cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile) cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile)
: cmOutputConverter(makefile->GetStateSnapshot()) : cmOutputConverter(makefile->GetStateSnapshot())
, StateSnapshot(makefile->GetStateSnapshot()) , StateSnapshot(makefile->GetStateSnapshot())
, DirectoryBacktrace(makefile->GetBacktrace())
{ {
this->GlobalGenerator = gg; this->GlobalGenerator = gg;
@ -68,7 +69,7 @@ cmLocalGenerator::~cmLocalGenerator()
void cmLocalGenerator::IssueMessage(cmake::MessageType t, void cmLocalGenerator::IssueMessage(cmake::MessageType t,
std::string const& text) const std::string const& text) const
{ {
this->Makefile->IssueMessage(t, text); this->GetCMakeInstance()->IssueMessage(t, text, this->DirectoryBacktrace);
} }
void cmLocalGenerator::ComputeObjectMaxPath() void cmLocalGenerator::ComputeObjectMaxPath()

1
Source/cmLocalGenerator.h
View File

@ -368,6 +368,7 @@ protected:
cmMakefile* Makefile; cmMakefile* Makefile;
cmState::Snapshot StateSnapshot; cmState::Snapshot StateSnapshot;
cmListFileBacktrace DirectoryBacktrace;
cmGlobalGenerator* GlobalGenerator; cmGlobalGenerator* GlobalGenerator;
std::map<std::string, std::string> UniqueObjectNamesMap; std::map<std::string, std::string> UniqueObjectNamesMap;
std::string::size_type ObjectPathMax; std::string::size_type ObjectPathMax;