mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary arbitrary CollapseFullPath second arguments

Browse Source 
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.
This commit is contained in:
Brad King
2020-10-15 15:07:21 -04:00
parent 024de8d137
commit 9e5e2d704a
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmAddCustomCommandCommand.cxx
+1 -2
View File
@@ -215,8 +215,7 @@ bool cmAddCustomCommandCommand(std::vector<std::string> const& args,
} }
if (cmSystemTools::FileIsFullPath(filename)) { if (cmSystemTools::FileIsFullPath(filename)) {
filename = cmSystemTools::CollapseFullPath( filename = cmSystemTools::CollapseFullPath(filename);
filename, status.GetMakefile().GetHomeOutputDirectory());
} }
switch (doing) { switch (doing) {
case doing_depfile: case doing_depfile:
Source/cmCustomCommandGenerator.cxx
+1 -2
View File
@@ -35,8 +35,7 @@ void AppendPaths(const std::vector<std::string>& inputs,
for (std::string& it : result) { for (std::string& it : result) {
cmSystemTools::ConvertToUnixSlashes(it); cmSystemTools::ConvertToUnixSlashes(it);
if (cmSystemTools::FileIsFullPath(it)) { if (cmSystemTools::FileIsFullPath(it)) {
it = cmSystemTools::CollapseFullPath( it = cmSystemTools::CollapseFullPath(it);
it, lg->GetMakefile()->GetHomeOutputDirectory());
} }
} }
cm::append(output, result); cm::append(output, result);
Source/cmSourceFileLocation.cxx
+1 -2
View File
@@ -33,8 +33,7 @@ cmSourceFileLocation::cmSourceFileLocation(cmMakefile const* mf,
this->AmbiguousExtension = true; this->AmbiguousExtension = true;
this->Directory = cmSystemTools::GetFilenamePath(name); this->Directory = cmSystemTools::GetFilenamePath(name);
if (cmSystemTools::FileIsFullPath(this->Directory)) { if (cmSystemTools::FileIsFullPath(this->Directory)) {
this->Directory = cmSystemTools::CollapseFullPath( this->Directory = cmSystemTools::CollapseFullPath(this->Directory);
this->Directory, mf->GetHomeOutputDirectory());
} }
this->Name = cmSystemTools::GetFilenameName(name); this->Name = cmSystemTools::GetFilenameName(name);
if (kind == cmSourceFileLocationKind::Known) { if (kind == cmSourceFileLocationKind::Known) {