diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-08 13:03:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-08 13:03:23 (GMT) |
| commit | 77053ed4701d1018853581b4f79e057ff6fa0dbd (patch) | |
| tree | cbd9937f001f86d3432bfb74bfb86389dd0b9fec /Source | |
| parent | e8295e532ba36096627306faaa5bd62591d9e626 (diff) | |
| parent | d54f0aa9b71dfcc04f077e5b19c6122cb4b98d83 (diff) | |
| download | CMake-77053ed4701d1018853581b4f79e057ff6fa0dbd.zip CMake-77053ed4701d1018853581b4f79e057ff6fa0dbd.tar.gz CMake-77053ed4701d1018853581b4f79e057ff6fa0dbd.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 062f8e9..5a31ab2 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -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( |