diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:11:27 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-21 09:46:15 +0100 |
commit | 7f64390b777170ecdd285508b0fa6978db61cf66 (patch) | |
tree | b9ff7d4ee70def4be8e35e92a27479b2c3b60e4f /examples/scxml/mediaplayer-qml-cppdatamodel | |
parent | be4f54e375fe141069faaf551f5873de8d7eecaa (diff) |
Improve examples CMakeLists.txt
- Remove "# generated from xyz.pro" comment from 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: Iaf7286069494041e90a59cedeae30ef26713d538
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/scxml/mediaplayer-qml-cppdatamodel')
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt index b5625fb..281fe12 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt @@ -1,33 +1,28 @@ -# Generated from mediaplayer-qml-cppdatamodel.pro. - cmake_minimum_required(VERSION 3.16) project(mediaplayer-qml-cppdatamodel 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}/scxml/mediaplayer-qml-cppdatamodel") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Scxml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml) qt_add_executable(mediaplayer-qml-cppdatamodel mediaplayer-qml-cppdatamodel.cpp thedatamodel.cpp thedatamodel.h ) + set_target_properties(mediaplayer-qml-cppdatamodel PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(mediaplayer-qml-cppdatamodel PUBLIC Qt::Core Qt::Gui @@ -35,11 +30,11 @@ target_link_libraries(mediaplayer-qml-cppdatamodel PUBLIC Qt::Scxml ) - # Resources: set_source_files_properties("../mediaplayer-common/Mediaplayer.qml" PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml" ) + set(mediaplayer-qml-cppdatamodel_resource_files "../mediaplayer-common/Mediaplayer.qml" "mediaplayer-qml-cppdatamodel.qml" @@ -52,7 +47,6 @@ qt6_add_resources(mediaplayer-qml-cppdatamodel "mediaplayer-qml-cppdatamodel" ${mediaplayer-qml-cppdatamodel_resource_files} ) - # Statecharts: qt6_add_statecharts(mediaplayer-qml-cppdatamodel mediaplayer-cppdatamodel.scxml |