diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:33:08 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-19 08:56:49 +0100 |
| commit | 1b640ab2aa150adfc04ad378cd1aadce7054a56a (patch) | |
| tree | c95637c448cd1975876c29389c018265a5984d97 /examples/designer/customwidgetplugin | |
| parent | bf18e7956ddb0f99f0358f67cfe043553babbdad (diff) | |
Improve examples CMakeLists.txt
- Remove # generated from xyz.pro comment from pro2cmake
- Remove "# special case" markers for pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR,
when unnecessary
- Combine multiple find_package(Qt6 ... calls)
- use REQUIRED COMPONENTS
- sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands
Pick-to: 6.3
Change-Id: If8bf84b498189fa681cfe5128bc8566026dabec0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/designer/customwidgetplugin')
| -rw-r--r-- | examples/designer/customwidgetplugin/CMakeLists.txt | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/examples/designer/customwidgetplugin/CMakeLists.txt b/examples/designer/customwidgetplugin/CMakeLists.txt index ca2b0448b..007a5242c 100644 --- a/examples/designer/customwidgetplugin/CMakeLists.txt +++ b/examples/designer/customwidgetplugin/CMakeLists.txt @@ -1,36 +1,27 @@ -# Generated from customwidgetplugin.pro. - cmake_minimum_required(VERSION 3.16) project(customwidgetplugin LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/plugins/designer") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/plugins/designer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS UiPlugin) +find_package(Qt6 REQUIRED COMPONENTS Core Gui UiPlugin Widgets) -# special case begin qt_add_plugin(customwidgetplugin) target_sources(customwidgetplugin PRIVATE analogclock.cpp analogclock.h customwidgetplugin.cpp customwidgetplugin.h ) -# special case end + set_target_properties(customwidgetplugin PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(customwidgetplugin PUBLIC Qt::Core Qt::Gui |