diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-19 13:56:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-19 13:57:23 (GMT) |
| commit | a13a5c948e3e530716efaae0f56d9d9766c5d315 (patch) | |
| tree | 4c28b4b971a1caa349014cd9d101627b245d17f6 /Source/CPack | |
| parent | d2101e944a03056dc2180dd790ba85175e04d653 (diff) | |
| download | CMake-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/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackFreeBSDGenerator.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 635de49..cfb5efd 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -195,7 +195,7 @@ bool DebGenerator::generateDataTar() const // XXX/application/usr/bin/myprogram with GEN_WDIR=XXX/application // should not add XXX/application orderedFiles.insert(currentPath); - currentPath = cmSystemTools::CollapseCombinedPath(currentPath, ".."); + currentPath = cmSystemTools::CollapseFullPath("..", currentPath); } } diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx b/Source/CPack/cmCPackFreeBSDGenerator.cxx index fcf8af1..dd8127d 100644 --- a/Source/CPack/cmCPackFreeBSDGenerator.cxx +++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx @@ -325,8 +325,7 @@ int cmCPackFreeBSDGenerator::PackageFiles() ONE_PACKAGE_PER_COMPONENT); } - std::string output_dir = - cmSystemTools::CollapseCombinedPath(toplevel, "../"); + std::string output_dir = cmSystemTools::CollapseFullPath("../", toplevel); pkg_create_from_manifest(output_dir.c_str(), ::TXZ, toplevel.c_str(), manifestname.c_str(), nullptr); |