mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Add AUTO*_EXECUTABLE strings to Keywords class

Browse Source
This commit is contained in:
Sebastian Holtermann
2019-04-02 19:14:27 +02:00
parent b32e18fb88
commit 5fb122ff75
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmQtAutoGenGlobalInitializer.cxx
View File

@@ -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
Source/cmQtAutoGenGlobalInitializer.h
View File

@@ -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: