diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-01-20 17:42:48 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-01-24 13:25:13 +0100 |
| commit | 9d82f4bff8520c3f6db7790d9044c3dfc5cc84c0 (patch) | |
| tree | 208f1e58e65083c7ddad2abdf1473679176fdaad /examples/quick/embeddedinwidgets | |
| parent | a3924b9846f8f3412e6cfc3704f69488e64da98e (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
- 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: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/quick/embeddedinwidgets')
| -rw-r--r-- | examples/quick/embeddedinwidgets/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index 9f90d696b7..aedc1f8fc0 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -1,22 +1,20 @@ cmake_minimum_required(VERSION 3.16) project(embeddedinwidgets LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/embeddedinwidgets") -find_package(Qt6 COMPONENTS Core Gui Widgets Quick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Widgets) qt_add_executable(embeddedinwidgetsexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(embeddedinwidgetsexample PRIVATE Qt::Core Qt::Gui @@ -24,7 +22,6 @@ target_link_libraries(embeddedinwidgetsexample PRIVATE Qt::Widgets ) - # Resources: qt_add_qml_module(embeddedinwidgetsexample URI embeddedinwidgets |