Autogen: Generate rcc wrapper file on demand

For multi configuration generators remove per-config
qrc_FOO_$<CONFIG>.cpp source file support.
Instead use a single source file qrc_FOO.cpp which is a wrapper
that includes the actual rcc generated qrc_FOO_CONFIG.cpp file.

This way, after a repeated configuration change, only the wrapper file
qrc_FOO.cpp must be regenerated to include the appropriate
qrc_FOO_CONFIG.cpp file.

1 files changed, 10 insertions, 19 deletions

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index ab247cb..1c0d4c3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -882,29 +882,20 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
           // Compose rcc output file name
           {
-            std::string rccOutBase = autogenBuildDir + "/";
-            rccOutBase += fpathCheckSum.getPart(absFile);
-            rccOutBase += "/qrc_";
-            rccOutBase +=
+            std::string rccBuildFile = autogenBuildDir + "/";
+            rccBuildFile += fpathCheckSum.getPart(absFile);
+            rccBuildFile += "/qrc_";
+            rccBuildFile +=
               cmsys::SystemTools::GetFilenameWithoutLastExtension(absFile);
+            rccBuildFile += ".cpp";
 
             // Register rcc ouput file as generated
-            for (std::vector<std::string>::const_iterator it =
-                   suffixes.begin();
-                 it != suffixes.end(); ++it) {
-              std::string rccOutCfg = rccOutBase;
-              rccOutCfg += *it;
-              rccOutCfg += ".cpp";
-              AddGeneratedSource(makefile, rccOutCfg,
-                                 cmQtAutoGeneratorCommon::RCC);
-              autogenProvides.push_back(rccOutCfg);
-            }
+            AddGeneratedSource(makefile, rccBuildFile,
+                               cmQtAutoGeneratorCommon::RCC);
             // Add rcc output file to origin target sources
-            if (multiConfig) {
-              target->AddSource(rccOutBase + "_$<CONFIG>.cpp");
-            } else {
-              target->AddSource(rccOutBase + ".cpp");
-            }
+            target->AddSource(rccBuildFile);
+            // Register rcc ouput file as generated by the _autogen target
+            autogenProvides.push_back(rccBuildFile);
           }
 
           if (PropertyEnabled(sf, "GENERATED")) {