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/calculatorbuilder | |
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/calculatorbuilder')
-rw-r--r-- | examples/designer/calculatorbuilder/CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/examples/designer/calculatorbuilder/CMakeLists.txt b/examples/designer/calculatorbuilder/CMakeLists.txt index dc1d9de5b..736d473ca 100644 --- a/examples/designer/calculatorbuilder/CMakeLists.txt +++ b/examples/designer/calculatorbuilder/CMakeLists.txt @@ -1,33 +1,27 @@ -# Generated from calculatorbuilder.pro. - cmake_minimum_required(VERSION 3.16) project(calculatorbuilder 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}/designer/calculatorbuilder") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS UiTools) +find_package(Qt6 REQUIRED COMPONENTS Core Gui UiTools Widgets) qt_add_executable(calculatorbuilder calculatorform.cpp calculatorform.h main.cpp ) + set_target_properties(calculatorbuilder PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(calculatorbuilder PUBLIC Qt::Core Qt::Gui @@ -35,7 +29,6 @@ target_link_libraries(calculatorbuilder PUBLIC Qt::Widgets ) - # Resources: set(calculatorbuilder_resource_files "calculatorform.ui" |