diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-04-02 17:14:27 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-04-02 18:12:52 (GMT) |
| commit | 5fb122ff75f0fac2c421a6cba6c78a2123e3fd49 (patch) | |
| tree | bf9b9b0c9450dc6ba979df635321bfa8c10cc134 | |
| parent | b32e18fb88434d3f9d58447212ee33a51430c144 (diff) | |
| download | CMake-5fb122ff75f0fac2c421a6cba6c78a2123e3fd49.zip CMake-5fb122ff75f0fac2c421a6cba6c78a2123e3fd49.tar.gz CMake-5fb122ff75f0fac2c421a6cba6c78a2123e3fd49.tar.bz2 | |
Autogen: Add `AUTO*_EXECUTABLE` strings to Keywords class
| -rw-r--r-- | Source/cmQtAutoGenGlobalInitializer.cxx | 9 | ||||
| -rw-r--r-- | Source/cmQtAutoGenGlobalInitializer.h | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenGlobalInitializer.cxx b/Source/cmQtAutoGenGlobalInitializer.cxx index ab51570..45a21f5 100644 --- a/Source/cmQtAutoGenGlobalInitializer.cxx +++ b/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); diff --git a/Source/cmQtAutoGenGlobalInitializer.h b/Source/cmQtAutoGenGlobalInitializer.h index 76ed76b..abff589 100644 --- a/Source/cmQtAutoGenGlobalInitializer.h +++ b/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: |