diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-04-23 13:18:10 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-04-23 16:46:58 (GMT) |
| commit | b45976fe104902ed7f0495e0e4c822684a4455e7 (patch) | |
| tree | 5fd9cbea65dcfc5e46246f54043c8d98559e3c53 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 8c00f5ef0a29758c56fa46a11e150b0e0f5c364e (diff) | |
| download | CMake-b45976fe104902ed7f0495e0e4c822684a4455e7.zip CMake-b45976fe104902ed7f0495e0e4c822684a4455e7.tar.gz CMake-b45976fe104902ed7f0495e0e4c822684a4455e7.tar.bz2 | |
Ninja: Remove config suffix from order-only target
Fixes: #20621
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index d1577ac..b6c343c 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1055,10 +1055,9 @@ void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies() } std::string cmGlobalNinjaGenerator::OrderDependsTargetForTarget( - cmGeneratorTarget const* target, const std::string& config) + cmGeneratorTarget const* target, const std::string& /*config*/) const { - return "cmake_object_order_depends_target_" + target->GetName() + "_" + - cmSystemTools::UpperCase(config); + return cmStrCat("cmake_object_order_depends_target_", target->GetName()); } void cmGlobalNinjaGenerator::AppendTargetOutputs( @@ -2679,3 +2678,10 @@ bool cmGlobalNinjaMultiGenerator::ReadCacheEntriesForBuild( return true; } + +std::string cmGlobalNinjaMultiGenerator::OrderDependsTargetForTarget( + cmGeneratorTarget const* target, const std::string& config) const +{ + return cmStrCat("cmake_object_order_depends_target_", target->GetName(), '_', + cmSystemTools::UpperCase(config)); +} |