summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenerator.h
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/cmQtAutoGenerator.h
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/cmQtAutoGenerator.h')
-rw-r--r--Source/cmQtAutoGenerator.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h
index 6771dd8..b55bebc 100644
--- a/Source/cmQtAutoGenerator.h
+++ b/Source/cmQtAutoGenerator.h
@@ -77,9 +77,9 @@ public:
// -- Paths
/// @brief Wrapper for cmSystemTools::GetRealPath
std::string GetRealPath(std::string const& filename);
- /// @brief Wrapper for cmSystemTools::CollapseCombinedPath
- std::string CollapseCombinedPath(std::string const& dir,
- std::string const& file);
+ /// @brief Wrapper for cmSystemTools::CollapseFullPath
+ std::string CollapseFullPath(std::string const& file,
+ std::string const& dir);
/// @brief Wrapper for cmSystemTools::SplitPath
void SplitPath(const std::string& p, std::vector<std::string>& components,
bool expand_home_dir = true);