From 414332ff57650862face4b23872062c4b4e018ca Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 12 Mar 2019 15:24:38 -0400 Subject: cmake_ninja_dyndep: don't duplicate slashes --- Source/cmGlobalNinjaGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 841587cce7..e443678d76 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1997,7 +1997,7 @@ int cmcmd_cmake_ninja_dyndep(std::vector::const_iterator argBeg, std::string const dir_top_bld = tdi["dir-top-bld"].asString(); std::string const dir_top_src = tdi["dir-top-src"].asString(); std::string module_dir = tdi["module-dir"].asString(); - if (!module_dir.empty()) { + if (!module_dir.empty() && !cmHasLiteralSuffix(module_dir, "/")) { module_dir += "/"; } std::vector linked_target_dirs; -- cgit v1.2.1 From 76e6e01c6ca67f1449a2bcd1f434657de7f0240b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 12 Mar 2019 15:25:03 -0400 Subject: cmNinjaTargetGenerator: use a different depfile for preprocessing If the compile rule also needs a depfile, the names now no longer collide. --- Source/cmNinjaTargetGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 8d11408325..1ad26dde7a 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1113,7 +1113,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( // Explicit preprocessing always uses a depfile. ppVars["DEP_FILE"] = this->GetLocalGenerator()->ConvertToOutputFormat( - objectFileName + ".d", cmOutputConverter::SHELL); + objectFileName + ".pp.d", cmOutputConverter::SHELL); if (compilePP) { // The actual compilation does not need a depfile because it // depends on the already-preprocessed source. -- cgit v1.2.1