Ninja Multi-Config: Improve error handling when not doing cross-config build

1 files changed, 9 insertions, 3 deletions

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index ea66e3d..922beb7 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1192,7 +1192,10 @@ void cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream& os)
       this->AppendTargetOutputs(ta.second.GeneratorTarget, build.ExplicitDeps,
                                 ta.second.Config);
     }
-    this->WriteBuild(os, build);
+    this->WriteBuild(this->EnableCrossConfigBuild()
+                       ? os
+                       : *this->GetConfigFileStream(ta.second.Config),
+                     build);
   }
 
   if (this->IsMultiConfig()) {
@@ -1259,7 +1262,10 @@ void cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
         }
       }
       // Write target
-      this->WriteBuild(os, build);
+      this->WriteBuild(this->EnableCrossConfigBuild()
+                         ? os
+                         : *this->GetConfigFileStream(config),
+                       build);
     }
 
     // Add shortcut target
@@ -1282,7 +1288,7 @@ void cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
       }
       build.Outputs.front() = this->BuildAlias(
         this->ConvertToNinjaPath(currentBinaryDir + "/all"), "all");
-      this->WriteBuild(*this->GetCommonFileStream(), build);
+      this->WriteBuild(os, build);
     }
   }
 }