diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-06 12:43:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-06 12:43:54 (GMT) |
| commit | 1d76991a412873aa3a0aed9735a06d658ef367e7 (patch) | |
| tree | 04babf38eb511a4a159b9dcdd8071d3fed843adc /Source/cmGlobalGenerator.h | |
| parent | d7a1bcd2e67e27d8897c100f14744547ef639d64 (diff) | |
| parent | 87e7904c915976456028fcd834bdea9bf07b47fd (diff) | |
| download | CMake-1d76991a412873aa3a0aed9735a06d658ef367e7.zip CMake-1d76991a412873aa3a0aed9735a06d658ef367e7.tar.gz CMake-1d76991a412873aa3a0aed9735a06d658ef367e7.tar.bz2 | |
Merge topic 'autogen_single_entry'
87e7904c91 Autogen: Use a single AUTOGEN setup function in cmGlobalGenerator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2260
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 54dbfc7..1ed070e 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -33,7 +33,6 @@ class cmLinkLineComputer; class cmLocalGenerator; class cmMakefile; class cmOutputConverter; -class cmQtAutoGenInitializer; class cmSourceFile; class cmStateDirectory; class cmake; @@ -443,9 +442,9 @@ protected: virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const; - // Qt auto generators - std::vector<std::unique_ptr<cmQtAutoGenInitializer>> - CreateQtAutoGenInitializers(); + /// @brief Qt AUTOMOC/UIC/RCC target generation + /// @return true on success + bool QtAutoGen(); std::string SelectMakeProgram(const std::string& makeProgram, const std::string& makeDefault = "") const; |