mirror/cmake
1
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-01-26 11:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Source: Remove unnecessary calls to CollapseFullPath

Browse Source 
Remove call sites whose input is already an absolute path,
or whose result is not used.
This commit is contained in:
Brad King 2024-10-17 15:06:25 -04:00
parent 808ae84483
commit b81c273445
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefileTargetGenerator.cxx
View File

@ -683,9 +683,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
// The object file should be checked for dependency integrity.
std::string objFullPath =
cmStrCat(this->LocalGenerator->GetCurrentBinaryDirectory(), '/', obj);
objFullPath = cmSystemTools::CollapseFullPath(objFullPath);
std::string const srcFullPath =
cmSystemTools::CollapseFullPath(source.GetFullPath());
std::string const srcFullPath = source.GetFullPath();
this->LocalGenerator->AddImplicitDepends(this->GeneratorTarget, lang,
objFullPath, srcFullPath, scanner);
@ -1560,8 +1558,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
cmOutputConverter::SHELL)
<< " "
<< this->LocalGenerator->ConvertToOutputFormat(
cmSystemTools::CollapseFullPath(this->InfoFileNameFull),
cmOutputConverter::SHELL);
this->InfoFileNameFull, cmOutputConverter::SHELL);
if (this->LocalGenerator->GetColorMakefile()) {
depCmd << " \"--color=$(COLOR)\"";
}

1
Source/cmQtAutoGenerator.cxx
View File

@ -439,7 +439,6 @@ bool cmQtAutoGenerator::Run(cm::string_view infoFile, cm::string_view config,
// Info file
this->InfoFile_ = std::string(infoFile);
cmSystemTools::CollapseFullPath(this->InfoFile_);
this->InfoDir_ = cmSystemTools::GetFilenamePath(this->InfoFile_);
// Load info file time

17
Source/cmStateDirectory.cxx
View File

@ -21,7 +21,6 @@
#include "cmState.h"
#include "cmStatePrivate.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmValue.h"
static std::string const kBINARY_DIR = "BINARY_DIR";
@ -36,11 +35,9 @@ std::string const& cmStateDirectory::GetCurrentSource() const
void cmStateDirectory::SetCurrentSource(std::string const& dir)
{
std::string& loc = this->DirectoryState->Location;
loc = dir;
cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc);
this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc);
this->DirectoryState->Location = dir;
this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR",
this->DirectoryState->Location);
}
std::string const& cmStateDirectory::GetCurrentBinary() const
@ -50,11 +47,9 @@ std::string const& cmStateDirectory::GetCurrentBinary() const
void cmStateDirectory::SetCurrentBinary(std::string const& dir)
{
std::string& loc = this->DirectoryState->OutputLocation;
loc = dir;
cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc);
this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc);
this->DirectoryState->OutputLocation = dir;
this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR",
this->DirectoryState->OutputLocation);
}
cmStateDirectory::cmStateDirectory(