summaryrefslogtreecommitdiffstats
path: root/Source/cmCustomCommandGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-15 19:07:21 (GMT)
committerBrad King <brad.king@kitware.com>2020-10-27 18:36:16 (GMT)
commit9e5e2d704abaef1b0a45201985f06a15290c1d09 (patch)
tree038d10afa652916ec0e96b5da9de657032d01d50 /Source/cmCustomCommandGenerator.cxx
parent024de8d1371cc4f0cf4921c6e28553c8df423413 (diff)
downloadCMake-9e5e2d704abaef1b0a45201985f06a15290c1d09.zip
CMake-9e5e2d704abaef1b0a45201985f06a15290c1d09.tar.gz
CMake-9e5e2d704abaef1b0a45201985f06a15290c1d09.tar.bz2
Remove unnecessary arbitrary CollapseFullPath second arguments
Some calls to CollapseFullPath that already have an absolute path were updated by commit 22f38c0d6b (cmake: avoid getcwd in `CollapseFullPath`, 2020-01-14, v3.17.0-rc1~171^2) to pass an arbitrary second argument to prevent unnecessary `getcwd` calls. Since then, the KWSys implementation of CollapseFullPath has learned to avoid unnecessary `getcwd` calls on its own, so we can drop the arbitrary second arguments to our CollapseFullPath calls.
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
-rw-r--r--Source/cmCustomCommandGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index d8307f6..6f5c8e9 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -35,8 +35,7 @@ void AppendPaths(const std::vector<std::string>& inputs,
for (std::string& it : result) {
cmSystemTools::ConvertToUnixSlashes(it);
if (cmSystemTools::FileIsFullPath(it)) {
- it = cmSystemTools::CollapseFullPath(
- it, lg->GetMakefile()->GetHomeOutputDirectory());
+ it = cmSystemTools::CollapseFullPath(it);
}
}
cm::append(output, result);