mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Add OutputLinkLibraries overload with backtraces

Browse Source
This commit is contained in:
Justin Goshi
2019-09-11 11:15:08 -07:00
committed by Brad King
parent 5d39e792ae
commit 5bd65dff7a
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmLocalGenerator.cxx
View File

@@ -1525,6 +1525,19 @@ void cmLocalGenerator::OutputLinkLibraries(
cmComputeLinkInformation* pcli, cmLinkLineComputer* linkLineComputer,
std::string& linkLibraries, std::string& frameworkPath,
std::string& linkPath)
{
std::vector<BT<std::string>> linkLibrariesList;
std::vector<BT<std::string>> linkPathList;
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibrariesList,
frameworkPath, linkPathList);
pcli->AppendValues(linkLibraries, linkLibrariesList);
pcli->AppendValues(linkPath, linkPathList);
}
void cmLocalGenerator::OutputLinkLibraries(
cmComputeLinkInformation* pcli, cmLinkLineComputer* linkLineComputer,
std::vector<BT<std::string>>& linkLibraries, std::string& frameworkPath,
std::vector<BT<std::string>>& linkPath)
{
cmComputeLinkInformation& cli = *pcli;
@@ -1557,10 +1570,9 @@ void cmLocalGenerator::OutputLinkLibraries(
cmStrCat("CMAKE_", linkLanguage, "_FRAMEWORK_SEARCH_FLAG"));
frameworkPath = linkLineComputer->ComputeFrameworkPath(cli, fwSearchFlag);
linkPath =
linkLineComputer->ComputeLinkPath(cli, libPathFlag, libPathTerminator);
linkLibraries = linkLineComputer->ComputeLinkLibraries(cli, stdLibString);
linkLineComputer->ComputeLinkPath(cli, libPathFlag, libPathTerminator,
linkPath);
linkLineComputer->ComputeLinkLibraries(cli, stdLibString, linkLibraries);
}
std::string cmLocalGenerator::GetLinkLibsCMP0065(

5
Source/cmLocalGenerator.h
View File

@@ -430,6 +430,11 @@ protected:
cmLinkLineComputer* linkLineComputer,
std::string& linkLibraries,
std::string& frameworkPath, std::string& linkPath);
void OutputLinkLibraries(cmComputeLinkInformation* pcli,
cmLinkLineComputer* linkLineComputer,
std::vector<BT<std::string>>& linkLibraries,
std::string& frameworkPath,
std::vector<BT<std::string>>& linkPath);
// Handle old-style install rules stored in the targets.
void GenerateTargetInstallRules(