cmGlobalNinjaGenerator: Factor out custom command output collection

De-duplicate code paths calling ConvertToNinjaPath and
SeenCustomCommandOutput on custom command outputs and custom target
byproducts.

1 files changed, 14 insertions, 1 deletions

diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 6fbdb82..2833367 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -110,13 +110,26 @@ public:
   void WriteBuild(std::ostream& os, cmNinjaBuild const& build,
                   int cmdLineLimit = 0, bool* usedResponseFile = nullptr);
 
+  class CCOutputs
+  {
+    cmGlobalNinjaGenerator* GG;
+
+  public:
+    CCOutputs(cmGlobalNinjaGenerator* gg)
+      : GG(gg)
+    {
+    }
+    void Add(std::vector<std::string> const& outputs);
+    cmNinjaDeps ExplicitOuts;
+  };
+
   void WriteCustomCommandBuild(std::string const& command,
                                std::string const& description,
                                std::string const& comment,
                                std::string const& depfile,
                                std::string const& pool, bool uses_terminal,
                                bool restat, std::string const& config,
-                               cmNinjaDeps outputs,
+                               CCOutputs outputs,
                                cmNinjaDeps explicitDeps = cmNinjaDeps(),
                                cmNinjaDeps orderOnlyDeps = cmNinjaDeps());