summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-06-09 07:58:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-06-12 17:01:45 (GMT)
commit096c7754b3b7edd2e69f79b81b06539e5c9314f3 (patch)
tree1d0ff09bc84c9b7a1262f1ef0c59b8a561fa4cc4
parentacf0c0f4446e6d3cee8b00a7ebc39d5d8040e42d (diff)
downloadCMake-096c7754b3b7edd2e69f79b81b06539e5c9314f3.zip
CMake-096c7754b3b7edd2e69f79b81b06539e5c9314f3.tar.gz
CMake-096c7754b3b7edd2e69f79b81b06539e5c9314f3.tar.bz2
cmLocalGenerator: Store Backtrace for the directory
Don't rely on cmMakefile to provide that. Use it to issue messages.
-rw-r--r--Source/cmLocalGenerator.cxx3
-rw-r--r--Source/cmLocalGenerator.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f543ec4..759e06c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -45,6 +45,7 @@
cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile)
: cmOutputConverter(makefile->GetStateSnapshot())
, StateSnapshot(makefile->GetStateSnapshot())
+ , DirectoryBacktrace(makefile->GetBacktrace())
{
this->GlobalGenerator = gg;
@@ -68,7 +69,7 @@ cmLocalGenerator::~cmLocalGenerator()
void cmLocalGenerator::IssueMessage(cmake::MessageType t,
std::string const& text) const
{
- this->Makefile->IssueMessage(t, text);
+ this->GetCMakeInstance()->IssueMessage(t, text, this->DirectoryBacktrace);
}
void cmLocalGenerator::ComputeObjectMaxPath()
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index ac2ebce..8e5563c 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -368,6 +368,7 @@ protected:
cmMakefile* Makefile;
cmState::Snapshot StateSnapshot;
+ cmListFileBacktrace DirectoryBacktrace;
cmGlobalGenerator* GlobalGenerator;
std::map<std::string, std::string> UniqueObjectNamesMap;
std::string::size_type ObjectPathMax;