mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja/Swift: Remove redundant calls to ConvertToNinjaPath

Browse Source 
`GetSourceFilePath` already handles converting to a Ninja path.
This commit is contained in:
Brad King
2021-05-20 14:21:56 -04:00
parent 7cf4dfcf78
commit ef553410e2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -1072,9 +1072,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
cmLocalGenerator const* LocalGen = this->GetLocalGenerator();
for (const auto& source : sources) {
oss << " "
<< LocalGen->ConvertToOutputFormat(
this->ConvertToNinjaPath(this->GetSourceFilePath(source)),
cmOutputConverter::SHELL);
<< LocalGen->ConvertToOutputFormat(this->GetSourceFilePath(source),
cmOutputConverter::SHELL);
}
return oss.str();
}();
@@ -1094,8 +1093,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
for (const auto& source : sources) {
linkBuild.Outputs.push_back(
this->ConvertToNinjaPath(this->GetObjectFilePath(source, config)));
linkBuild.ExplicitDeps.push_back(
this->ConvertToNinjaPath(this->GetSourceFilePath(source)));
linkBuild.ExplicitDeps.emplace_back(this->GetSourceFilePath(source));
}
linkBuild.Outputs.push_back(vars["SWIFT_MODULE"]);
} else {

3
Source/cmNinjaTargetGenerator.cxx
View File

@@ -1575,8 +1575,7 @@ void cmNinjaTargetGenerator::WriteTargetDependInfo(std::string const& lang,
void cmNinjaTargetGenerator::EmitSwiftDependencyInfo(
cmSourceFile const* source, const std::string& config)
{
std::string const sourceFilePath =
this->ConvertToNinjaPath(this->GetSourceFilePath(source));
std::string const sourceFilePath = this->GetSourceFilePath(source);
std::string const objectFilePath =
this->ConvertToNinjaPath(this->GetObjectFilePath(source, config));
std::string const swiftDepsPath = [source, objectFilePath]() -> std::string {