Merge topic 'ninja-order-depends'

d54f0aa9b7 Merge branch 'master' into ninja-order-depends
2f949be4b3 Ninja: Make config uppercase in object order target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4581
This commit is contained in:
Brad King
2020-04-08 13:03:13 +00:00
committed by Kitware Robot
+1 -1
View File
@@ -1067,7 +1067,7 @@ std::string cmGlobalNinjaGenerator::OrderDependsTargetForTarget(
cmGeneratorTarget const* target, const std::string& config)
{
return cmStrCat("cmake_object_order_depends_target_", target->GetName(), '_',
config);
cmSystemTools::UpperCase(config));
}
void cmGlobalNinjaGenerator::AppendTargetOutputs(