diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-25 14:11:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-25 14:11:50 (GMT) |
| commit | e4a9346dba41252f0f806b33cb026095e03fb00c (patch) | |
| tree | 337dc07ee2041e3a036817d9f847723e92bdaed3 /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | 9e5e645ae6081f8c29ef00144f85d69a64d361a0 (diff) | |
| parent | 30c2e1dd16e061fbabffa35816cb893d81ff0dcf (diff) | |
| download | CMake-e4a9346dba41252f0f806b33cb026095e03fb00c.zip CMake-e4a9346dba41252f0f806b33cb026095e03fb00c.tar.gz CMake-e4a9346dba41252f0f806b33cb026095e03fb00c.tar.bz2 | |
Merge branch 'fix-target_link_libraries-wrong-dir' into release
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 df37d66..b57b921 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -368,7 +368,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib, || this->CurrentProcessingState == ProcessingKeywordPublicInterface || this->CurrentProcessingState == ProcessingKeywordLinkInterface) ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature; - if (!this->Target->PushTLLCommandTrace(sig)) + if (!this->Target->PushTLLCommandTrace( + sig, this->Makefile->GetExecutionContext())) { std::ostringstream e; const char *modal = 0; |