diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-19 18:14:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-25 14:48:25 (GMT) |
| commit | fb3a57575aa91c636963a12b7d0b6ec64bfce241 (patch) | |
| tree | aabc6db45fe5bf76f118b7fe5cc29de3abc5668f /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 0f2b1c9d1bc4f802a4ecb647f2ca7258fc378df5 (diff) | |
| download | CMake-fb3a57575aa91c636963a12b7d0b6ec64bfce241.zip CMake-fb3a57575aa91c636963a12b7d0b6ec64bfce241.tar.gz CMake-fb3a57575aa91c636963a12b7d0b6ec64bfce241.tar.bz2 | |
cmNinjaTargetGenerator: Rename source file path lookup method for clarity
The `GetSourceFilePath` method is meant only for compiled sources, and
automatically handles converting it to a path for the Ninja build
manifest. Rename the method to clarify both.
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index e443981..e5e57d2 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -1072,8 +1072,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement( cmLocalGenerator const* LocalGen = this->GetLocalGenerator(); for (const auto& source : sources) { oss << " " - << LocalGen->ConvertToOutputFormat(this->GetSourceFilePath(source), - cmOutputConverter::SHELL); + << LocalGen->ConvertToOutputFormat( + this->GetCompiledSourceNinjaPath(source), + cmOutputConverter::SHELL); } return oss.str(); }(); @@ -1093,7 +1094,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement( for (const auto& source : sources) { linkBuild.Outputs.push_back( this->ConvertToNinjaPath(this->GetObjectFilePath(source, config))); - linkBuild.ExplicitDeps.emplace_back(this->GetSourceFilePath(source)); + linkBuild.ExplicitDeps.emplace_back( + this->GetCompiledSourceNinjaPath(source)); } linkBuild.Outputs.push_back(vars["SWIFT_MODULE"]); } else { |