Merge topic 'autouic-headers-ninja'

1265c65b33 AUTOUIC: Collect ui header files for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5803

1 files changed, 31 insertions, 0 deletions

diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index d4138d9..450a0cd 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -938,6 +938,30 @@ bool cmQtAutoGenInitializer::InitScanFiles()
           if (!uicOpts.empty()) {
             this->Uic.UiFiles.emplace_back(fullPath, cmExpandedList(uicOpts));
           }
+
+          auto uiHeaderRelativePath = cmSystemTools::RelativePath(
+            this->LocalGen->GetCurrentSourceDirectory(),
+            cmSystemTools::GetFilenamePath(fullPath));
+
+          auto uiHeaderFilePath = cmStrCat(
+            '/', uiHeaderRelativePath, '/', "ui_"_s,
+            cmSystemTools::GetFilenameWithoutLastExtension(fullPath), ".h"_s);
+
+          ConfigString uiHeader;
+          uiHeader.Default =
+            cmStrCat(this->Dir.Build, "/include"_s, uiHeaderFilePath);
+          auto uiHeaderGenex = uiHeader.Default;
+          if (this->MultiConfig) {
+            uiHeaderGenex = cmStrCat(this->Dir.Build, "/include_$<CONFIG>"_s,
+                                     uiHeaderFilePath);
+            for (std::string const& cfg : this->ConfigsList) {
+              uiHeader.Config[cfg] = cmStrCat(this->Dir.Build, "/include_"_s,
+                                              cfg, uiHeaderFilePath);
+            }
+          }
+
+          this->Uic.UiHeaders.emplace_back(
+            std::make_pair(uiHeader, uiHeaderGenex));
         } else {
           // Register skipped .ui file
           this->Uic.SkipUi.insert(fullPath);
@@ -1091,6 +1115,13 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
     autogenByproducts.push_back(this->Moc.CompilationFileGenex);
   }
 
+  if (this->Uic.Enabled) {
+    for (const auto& file : this->Uic.UiHeaders) {
+      this->AddGeneratedSource(file.first, this->Uic);
+      autogenByproducts.push_back(file.second);
+    }
+  }
+
   // Compose target comment
   std::string autogenComment;
   {