summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorJustin Goshi <jgoshi@microsoft.com>2019-09-11 18:37:48 (GMT)
committerBrad King <brad.king@kitware.com>2019-09-18 18:00:39 (GMT)
commit4d6334824d81086af205fe06b6fc4c4fda5224b4 (patch)
tree68fde8e73c4a899bc50dbd17ef5ae39423935c49 /Source/cmLocalGenerator.cxx
parent5bd65dff7a8198279b1e592b7e48b91119dfc794 (diff)
downloadCMake-4d6334824d81086af205fe06b6fc4c4fda5224b4.zip
CMake-4d6334824d81086af205fe06b6fc4c4fda5224b4.tar.gz
CMake-4d6334824d81086af205fe06b6fc4c4fda5224b4.tar.bz2
fileapi: add backtraces for LINK_PATH and LINK_DIRECTORIES
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx16
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a4b482c..214e92c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1198,17 +1198,21 @@ void cmLocalGenerator::GetTargetFlags(
std::string& linkLibs, std::string& flags, std::string& linkFlags,
std::string& frameworkPath, std::string& linkPath, cmGeneratorTarget* target)
{
- std::vector<BT<std::string>> tmpLinkFlags;
- this->GetTargetFlags(linkLineComputer, config, linkLibs, flags, tmpLinkFlags,
- frameworkPath, linkPath, target);
- this->AppendFlags(linkFlags, tmpLinkFlags);
+ std::vector<BT<std::string>> linkFlagsList;
+ std::vector<BT<std::string>> linkPathList;
+ std::vector<BT<std::string>> linkLibsList;
+ this->GetTargetFlags(linkLineComputer, config, linkLibsList, flags,
+ linkFlagsList, frameworkPath, linkPathList, target);
+ this->AppendFlags(linkFlags, linkFlagsList);
+ this->AppendFlags(linkPath, linkPathList);
+ this->AppendFlags(linkLibs, linkLibsList);
}
void cmLocalGenerator::GetTargetFlags(
cmLinkLineComputer* linkLineComputer, const std::string& config,
- std::string& linkLibs, std::string& flags,
+ std::vector<BT<std::string>>& linkLibs, std::string& flags,
std::vector<BT<std::string>>& linkFlags, std::string& frameworkPath,
- std::string& linkPath, cmGeneratorTarget* target)
+ std::vector<BT<std::string>>& linkPath, cmGeneratorTarget* target)
{
const std::string buildType = cmSystemTools::UpperCase(config);
cmComputeLinkInformation* pcli = target->GetLinkInformation(config);