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/trafficlight-qml-simple/CMakeLists.txt | |
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/trafficlight-qml-simple/CMakeLists.txt')
-rw-r--r-- | examples/scxml/trafficlight-qml-simple/CMakeLists.txt | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt index 0ab607d..ab33256 100644 --- a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from trafficlight-qml-simple.pro. - cmake_minimum_required(VERSION 3.16) project(trafficlight-qml-simple 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/trafficlight-qml-simple") -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(trafficlight-qml-simple trafficlight-qml-simple.cpp ) + set_target_properties(trafficlight-qml-simple PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(trafficlight-qml-simple PUBLIC Qt::Core Qt::Gui @@ -34,7 +27,6 @@ target_link_libraries(trafficlight-qml-simple PUBLIC Qt::Scxml ) - # Resources: set(trafficlight-qml-simple_resource_files "Light.qml" @@ -48,7 +40,6 @@ qt6_add_resources(trafficlight-qml-simple "trafficlight-qml-simple" ${trafficlight-qml-simple_resource_files} ) - # Statecharts: qt6_add_statecharts(trafficlight-qml-simple ../trafficlight-common/statemachine.scxml |