summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-04-08 13:03:13 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-04-08 13:03:23 (GMT)
commit685bfad05287ca7702ad238ba3c9ce62f26fa3f6 (patch)
tree7995a3a8860365e8ab30b50bdfed924717329269
parent3d61ff7b1028b00119d4b1388e9fe0fca34499ff (diff)
parent2f949be4b3a4e9da43a1c445300084a2d63837e2 (diff)
downloadCMake-685bfad05287ca7702ad238ba3c9ce62f26fa3f6.zip
CMake-685bfad05287ca7702ad238ba3c9ce62f26fa3f6.tar.gz
CMake-685bfad05287ca7702ad238ba3c9ce62f26fa3f6.tar.bz2
Merge topic 'ninja-order-depends' into release-3.17
2f949be4b3 Ninja: Make config uppercase in object order target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4581
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index f4d102e..331cf78 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1065,7 +1065,7 @@ std::string cmGlobalNinjaGenerator::OrderDependsTargetForTarget(
cmGeneratorTarget const* target, const std::string& config)
{
return "cmake_object_order_depends_target_" + target->GetName() + "_" +
- config;
+ cmSystemTools::UpperCase(config);
}
void cmGlobalNinjaGenerator::AppendTargetOutputs(