summaryrefslogtreecommitdiffstats
path: root/Source/cmGhsMultiTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-19 13:56:04 (GMT)
committerBrad King <brad.king@kitware.com>2019-03-19 13:57:23 (GMT)
commita13a5c948e3e530716efaae0f56d9d9766c5d315 (patch)
tree4c28b4b971a1caa349014cd9d101627b245d17f6 /Source/cmGhsMultiTargetGenerator.cxx
parentd2101e944a03056dc2180dd790ba85175e04d653 (diff)
downloadCMake-a13a5c948e3e530716efaae0f56d9d9766c5d315.zip
CMake-a13a5c948e3e530716efaae0f56d9d9766c5d315.tar.gz
CMake-a13a5c948e3e530716efaae0f56d9d9766c5d315.tar.bz2
Replace use of CollapseCombinedPath with CollapseFullPath
`CollapseCombinedPath` was introduced by commit 551d3343cd (cmDependsC: Collapse relative include paths, 2013-06-19, v2.8.12~237^2) where the existing `CollapseFullPath` should have been used instead. Then its use proliferated slightly. Since `CollapseCombinedPath` is less widely used and less robust (see issue #19049), use `CollapseFullPath` everywhere instead. Issue: #19050
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.cxx')
-rw-r--r--Source/cmGhsMultiTargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 9f8f12b..c73ec70 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -287,7 +287,7 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLine(std::ostream& fout,
if (l.compare(0, 2, "-l") == 0) {
fout << " \"" << l << "\"" << std::endl;
} else {
- std::string rl = cmSystemTools::CollapseCombinedPath(cbd, l);
+ std::string rl = cmSystemTools::CollapseFullPath(l, cbd);
fout << " -l\"" << rl << "\"" << std::endl;
}
}