浏览代码

Autogen: Add `AUTO*_EXECUTABLE` strings to Keywords class

Sebastian Holtermann 6 年之前
父节点
当前提交
5fb122ff75
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 6 3
      Source/cmQtAutoGenGlobalInitializer.cxx
  2. 4 0
      Source/cmQtAutoGenGlobalInitializer.h

+ 6 - 3
Source/cmQtAutoGenGlobalInitializer.cxx

@@ -24,6 +24,9 @@ cmQtAutoGenGlobalInitializer::Keywords::Keywords()
   : AUTOMOC("AUTOMOC")
   , AUTOUIC("AUTOUIC")
   , AUTORCC("AUTORCC")
+  , AUTOMOC_EXECUTABLE("AUTOMOC_EXECUTABLE")
+  , AUTOUIC_EXECUTABLE("AUTOUIC_EXECUTABLE")
+  , AUTORCC_EXECUTABLE("AUTORCC_EXECUTABLE")
 {
 }
 
@@ -86,11 +89,11 @@ cmQtAutoGenGlobalInitializer::cmQtAutoGenGlobalInitializer(
       bool const rcc = target->GetPropertyAsBool(kw().AUTORCC);
       if (moc || uic || rcc) {
         std::string const mocExec =
-          target->GetSafeProperty("AUTOMOC_EXECUTABLE");
+          target->GetSafeProperty(kw().AUTOMOC_EXECUTABLE);
         std::string const uicExec =
-          target->GetSafeProperty("AUTOUIC_EXECUTABLE");
+          target->GetSafeProperty(kw().AUTOUIC_EXECUTABLE);
         std::string const rccExec =
-          target->GetSafeProperty("AUTORCC_EXECUTABLE");
+          target->GetSafeProperty(kw().AUTORCC_EXECUTABLE);
 
         // We support Qt4, Qt5 and Qt6
         auto qtVersion = cmQtAutoGenInitializer::GetQtVersion(target);

+ 4 - 0
Source/cmQtAutoGenGlobalInitializer.h

@@ -27,6 +27,10 @@ public:
     std::string AUTOMOC;
     std::string AUTOUIC;
     std::string AUTORCC;
+
+    std::string AUTOMOC_EXECUTABLE;
+    std::string AUTOUIC_EXECUTABLE;
+    std::string AUTORCC_EXECUTABLE;
   };
 
 public: