diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-29 09:58:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-29 09:58:25 (GMT) |
| commit | 39677de5e209445c8cbc5957c1e79088d5d2a03a (patch) | |
| tree | 899f1c5fb22cc2dffc81758b1654964faecee3ac /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | 1382002ae2e78ea8bcda7f97be9130246ea40b11 (diff) | |
| parent | 07c1bdda3d42b255ddf9d7145e0aa952f87ee978 (diff) | |
| download | CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.zip CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.tar.gz CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.tar.bz2 | |
Merge topic 'simplify-execution-context'
07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace
727ed0c403 cmMakefile: Simplify ExpandArguments signature
e456dae669 cmConditionEvaluator: Remove extra copy of execution context
0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace
dc49abcb89 if,while: Clarify condition backtrace construction
68af831505 cmMakefile: Inline GetExecutionContext at call sites
280f3918f3 cmMakefile: Simplify GetExecutionContext implementation
0e59b45dfc cmListFileCache: Add explicit constructors
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5276
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 7db2c46..aecc18e 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -10,6 +10,7 @@ #include "cmExecutionStatus.h" #include "cmGeneratorExpression.h" #include "cmGlobalGenerator.h" +#include "cmListFileCache.h" #include "cmMakefile.h" #include "cmMessageType.h" #include "cmPolicies.h" @@ -386,7 +387,7 @@ bool TLL::HandleLibrary(ProcessingState currentProcessingState, ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature; if (!this->Target->PushTLLCommandTrace( - sig, this->Makefile.GetExecutionContext())) { + sig, this->Makefile.GetBacktrace().Top())) { std::ostringstream e; const char* modal = nullptr; MessageType messageType = MessageType::AUTHOR_WARNING; |