diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-04 15:29:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-04 15:29:51 (GMT) |
| commit | dc6b76d1e751224c60aba5489fb62228cd8a6bad (patch) | |
| tree | 5704642cc25414b10ed43011dd06b626b09307dd /Source/cmQtAutoGenInitializer.h | |
| parent | d1c2f8787ceb0cb5e30d433e05f774bbdd910ef9 (diff) | |
| parent | 18f7b2ed2111ff9dac5ef83d8bbf20b826b8bbe9 (diff) | |
| download | CMake-dc6b76d1e751224c60aba5489fb62228cd8a6bad.zip CMake-dc6b76d1e751224c60aba5489fb62228cd8a6bad.tar.gz CMake-dc6b76d1e751224c60aba5489fb62228cd8a6bad.tar.bz2 | |
Merge topic 'autogen_keywords_class'
18f7b2ed21 Autogen: Add more frequently used keywords to Keywords class
5fb122ff75 Autogen: Add `AUTO*_EXECUTABLE` strings to Keywords class
b32e18fb88 Autogen: Remove static const generator name strings from cmQtAutoGen
5431395d68 Autogen: Add cmQtAutogenGlobalInitializer::Keywords class
78eccc7836 Autogen: Remove lowercase generator name from generator variables class
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3182
Diffstat (limited to 'Source/cmQtAutoGenInitializer.h')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index 1f4087f..e7e5db2 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -62,7 +62,6 @@ public: bool Enabled = false; // Generator type/name GenT Gen; - std::string const& GenName; std::string const& GenNameUpper; // Executable std::string ExecutableTargetName; @@ -71,11 +70,9 @@ public: bool ExecutableExists = false; /// @brief Constructor - GenVarsT(GenT gen, std::string const& genName, - std::string const& genNameUpper) + GenVarsT(GenT gen) : Gen(gen) - , GenName(genName) - , GenNameUpper(genNameUpper){}; + , GenNameUpper(cmQtAutoGen::GeneratorNameUpper(gen)){}; }; /// @brief Writes a CMake info file @@ -213,8 +210,7 @@ private: /// @brief Constructor MocT() - : GenVarsT(cmQtAutoGen::GenT::MOC, cmQtAutoGen::GenAutoMoc, - cmQtAutoGen::GenAUTOMOC){}; + : GenVarsT(GenT::MOC){}; } Moc; /// @brief Uic only variables @@ -229,8 +225,7 @@ private: /// @brief Constructor UicT() - : GenVarsT(cmQtAutoGen::GenT::UIC, cmQtAutoGen::GenAutoUic, - cmQtAutoGen::GenAUTOUIC){}; + : GenVarsT(GenT::UIC){}; } Uic; /// @brief Rcc only variables @@ -242,8 +237,7 @@ private: /// @brief Constructor RccT() - : GenVarsT(cmQtAutoGen::GenT::RCC, cmQtAutoGen::GenAutoRcc, - cmQtAutoGen::GenAUTORCC){}; + : GenVarsT(GenT::RCC){}; } Rcc; }; |