diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-19 13:57:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-19 14:00:19 (GMT) |
| commit | aab8feeec22d7be284029d32f9e033e4791c48b2 (patch) | |
| tree | b6362c87a31803a29d6cadccde4cb171f879974f /Source/cmTarget.cxx | |
| parent | d120ccd19349447bce8104b8555bb34b13f78e46 (diff) | |
| parent | dacbb414550db63ff40225f3f6057c3c74bcf5c9 (diff) | |
| download | CMake-aab8feeec22d7be284029d32f9e033e4791c48b2.zip CMake-aab8feeec22d7be284029d32f9e033e4791c48b2.tar.gz CMake-aab8feeec22d7be284029d32f9e033e4791c48b2.tar.bz2 | |
Merge topic 'target-depend-backtraces'
dacbb41455 Track backtraces in target dependencies internally
a6e02f881d add_dependencies: Track backtraces internally
a093b1a4f3 cmLinkItem: Add backtrace
e022e2d873 cmListFileCache: Add ExpandListWithBacktrace helper
f1dd0eeaaf cmListFileCache: Add wrapper template for values with a backtrace
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2498
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index f0d6519..1458f01 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -486,24 +486,10 @@ cmGlobalGenerator* cmTarget::GetGlobalGenerator() const return this->GetMakefile()->GetGlobalGenerator(); } -void cmTarget::AddUtility(const std::string& u, cmMakefile* makefile) +void cmTarget::AddUtility(std::string const& u, cmMakefile* mf) { - if (this->Utilities.insert(u).second && makefile) { - this->UtilityBacktraces.insert( - std::make_pair(u, makefile->GetBacktrace())); - } -} - -cmListFileBacktrace const* cmTarget::GetUtilityBacktrace( - const std::string& u) const -{ - std::map<std::string, cmListFileBacktrace>::const_iterator i = - this->UtilityBacktraces.find(u); - if (i == this->UtilityBacktraces.end()) { - return nullptr; - } - - return &i->second; + BT<std::string> util(u, mf ? mf->GetBacktrace() : cmListFileBacktrace()); + this->Utilities.insert(util); } cmListFileBacktrace const& cmTarget::GetBacktrace() const |