Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

cmStateDirectory: Rename ConvertToRelPathIf{Not => }Contained

Browse Source 
The "Not" in the method name is backward from its logic.
This commit is contained in:
Brad King
2021-05-12 15:26:12 -04:00
parent 09bee3bee1
commit ba7b939831
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalGenerator.cxx
View File

@@ -3029,7 +3029,7 @@ void cmGlobalGenerator::AddRuleHash(const std::vector<std::string>& outputs,
// Shorten the output name (in expected use case). // Shorten the output name (in expected use case).
cmStateDirectory cmDir = cmStateDirectory cmDir =
this->GetMakefiles()[0]->GetStateSnapshot().GetDirectory(); this->GetMakefiles()[0]->GetStateSnapshot().GetDirectory();
std::string fname = cmDir.ConvertToRelPathIfNotContained( std::string fname = cmDir.ConvertToRelPathIfContained(
this->GetMakefiles()[0]->GetState()->GetBinaryDirectory(), outputs[0]); this->GetMakefiles()[0]->GetState()->GetBinaryDirectory(), outputs[0]);
// Associate the hash with this output. // Associate the hash with this output.

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@@ -610,7 +610,7 @@ cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
tname += "/fast"; tname += "/fast";
} }
tname = tname =
mf->GetStateSnapshot().GetDirectory().ConvertToRelPathIfNotContained( mf->GetStateSnapshot().GetDirectory().ConvertToRelPathIfContained(
mf->GetState()->GetBinaryDirectory(), tname); mf->GetState()->GetBinaryDirectory(), tname);
cmSystemTools::ConvertToOutputSlashes(tname); cmSystemTools::ConvertToOutputSlashes(tname);
makeCommand.Add(std::move(tname)); makeCommand.Add(std::move(tname));

4
Source/cmListFileCache.cxx
View File

@@ -550,7 +550,7 @@ void cmListFileBacktrace::PrintTitle(std::ostream& out) const
cmListFileContext lfc = this->TopEntry->Context; cmListFileContext lfc = this->TopEntry->Context;
cmStateSnapshot bottom = this->GetBottom(); cmStateSnapshot bottom = this->GetBottom();
if (!bottom.GetState()->GetIsInTryCompile()) { if (!bottom.GetState()->GetIsInTryCompile()) {
lfc.FilePath = bottom.GetDirectory().ConvertToRelPathIfNotContained( lfc.FilePath = bottom.GetDirectory().ConvertToRelPathIfContained(
bottom.GetState()->GetSourceDirectory(), lfc.FilePath); bottom.GetState()->GetSourceDirectory(), lfc.FilePath);
} }
out << (lfc.Line ? " at " : " in ") << lfc; out << (lfc.Line ? " at " : " in ") << lfc;
@@ -581,7 +581,7 @@ void cmListFileBacktrace::PrintCallStack(std::ostream& out) const
} }
cmListFileContext lfc = cur->Context; cmListFileContext lfc = cur->Context;
if (!bottom.GetState()->GetIsInTryCompile()) { if (!bottom.GetState()->GetIsInTryCompile()) {
lfc.FilePath = bottom.GetDirectory().ConvertToRelPathIfNotContained( lfc.FilePath = bottom.GetDirectory().ConvertToRelPathIfContained(
bottom.GetState()->GetSourceDirectory(), lfc.FilePath); bottom.GetState()->GetSourceDirectory(), lfc.FilePath);
} }
out << " " << lfc << "\n"; out << " " << lfc << "\n";

2
Source/cmLocalGenerator.cxx
View File

@@ -3676,7 +3676,7 @@ std::string const& cmLocalGenerator::GetCurrentSourceDirectory() const
std::string cmLocalGenerator::MaybeConvertToRelativePath( std::string cmLocalGenerator::MaybeConvertToRelativePath(
std::string const& local_path, std::string const& remote_path) const std::string const& local_path, std::string const& remote_path) const
{ {
return this->StateSnapshot.GetDirectory().ConvertToRelPathIfNotContained( return this->StateSnapshot.GetDirectory().ConvertToRelPathIfContained(
local_path, remote_path); local_path, remote_path);
} }

2
Source/cmStateDirectory.cxx
View File

@@ -159,7 +159,7 @@ bool cmStateDirectory::ContainsBoth(std::string const& local_path,
return bothInBinary || bothInSource; return bothInBinary || bothInSource;
} }
std::string cmStateDirectory::ConvertToRelPathIfNotContained( std::string cmStateDirectory::ConvertToRelPathIfContained(
std::string const& local_path, std::string const& remote_path) const std::string const& local_path, std::string const& remote_path) const
{ {
if (!this->ContainsBoth(local_path, remote_path)) { if (!this->ContainsBoth(local_path, remote_path)) {

2
Source/cmStateDirectory.h
View File

@@ -36,7 +36,7 @@ public:
bool ContainsBoth(std::string const& local_path, bool ContainsBoth(std::string const& local_path,
std::string const& remote_path) const; std::string const& remote_path) const;
std::string ConvertToRelPathIfNotContained( std::string ConvertToRelPathIfContained(
std::string const& local_path, std::string const& remote_path) const; std::string const& local_path, std::string const& remote_path) const;
cmStringRange GetIncludeDirectoriesEntries() const; cmStringRange GetIncludeDirectoriesEntries() const;

2
Source/cmTarget.cxx
View File

@@ -934,7 +934,7 @@ void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const
for (auto const& cmd : this->impl->TLLCommands) { for (auto const& cmd : this->impl->TLLCommands) {
if (cmd.first == sig) { if (cmd.first == sig) {
cmListFileContext lfc = cmd.second; cmListFileContext lfc = cmd.second;
lfc.FilePath = cmDir.ConvertToRelPathIfNotContained( lfc.FilePath = cmDir.ConvertToRelPathIfContained(
this->impl->Makefile->GetState()->GetSourceDirectory(), lfc.FilePath); this->impl->Makefile->GetState()->GetSourceDirectory(), lfc.FilePath);
s << " * " << lfc << '\n'; s << " * " << lfc << '\n';
} }