mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 18:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

target_*: Fix cross-directory call backtraces

Browse Source 
Record the call-site backtrace, not the current backtrace of the
target's directory.

Fixes: #23873
This commit is contained in:
Brad King
2022-08-22 10:58:46 -04:00
parent 0d64c3abd1
commit 52c95540b7
11 changed files with 67 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmTargetLinkLibrariesCommand.cxx
+5 -3
View File
@@ -625,7 +625,7 @@ bool TLL::HandleLibrary(ProcessingState currentProcessingState,
void TLL::AppendProperty(std::string const& prop, std::string const& value)
{
this->AffectsProperty(prop);
this->Target->AppendProperty(prop, value);
this->Target->AppendProperty(prop, value, this->Makefile.GetBacktrace());
}
void TLL::AffectsProperty(std::string const& prop)
@@ -636,14 +636,16 @@ void TLL::AffectsProperty(std::string const& prop)
// Add a wrapper to the expression to tell LookupLinkItem to look up
// names in the caller's directory.
if (this->Props.insert(prop).second) {
this->Target->AppendProperty(prop, this->DirectoryId);
this->Target->AppendProperty(prop, this->DirectoryId,
this->Makefile.GetBacktrace());
}
}
TLL::~TLL()
{
for (std::string const& prop : this->Props) {
this->Target->AppendProperty(prop, CMAKE_DIRECTORY_ID_SEP);
this->Target->AppendProperty(prop, CMAKE_DIRECTORY_ID_SEP,
this->Makefile.GetBacktrace());
}
}