diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:11:27 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-21 09:46:54 +0000 |
commit | 3d2b62177b1349a5a3115ce629a608cb8ba9352f (patch) | |
tree | 35b16e79d58d8ce4988dbaab1ab238025f77534d /examples/scxml/trafficlight-widgets-static/CMakeLists.txt | |
parent | 0694c726d096dbe6a4dc8573da793eedcfe2c1f5 (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
Change-Id: Iaf7286069494041e90a59cedeae30ef26713d538
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7f64390b777170ecdd285508b0fa6978db61cf66)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/scxml/trafficlight-widgets-static/CMakeLists.txt')
-rw-r--r-- | examples/scxml/trafficlight-widgets-static/CMakeLists.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt index 9277598..b508b82 100644 --- a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from trafficlight-widgets-static.pro. - cmake_minimum_required(VERSION 3.16) project(trafficlight-widgets-static 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-widgets-static") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Scxml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Scxml Widgets) qt_add_executable(trafficlight-widgets-static ../trafficlight-common/trafficlight.cpp ../trafficlight-common/trafficlight.h trafficlight-widgets-static.cpp ) + set_target_properties(trafficlight-widgets-static PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(trafficlight-widgets-static PUBLIC Qt::Core Qt::Gui @@ -35,26 +28,31 @@ target_link_libraries(trafficlight-widgets-static PUBLIC Qt::Widgets ) - # Resources: set_source_files_properties("../trafficlight-common/background.png" PROPERTIES QT_RESOURCE_ALIAS "background.png" ) + set_source_files_properties("../trafficlight-common/green.png" PROPERTIES QT_RESOURCE_ALIAS "green.png" ) + set_source_files_properties("../trafficlight-common/pause.png" PROPERTIES QT_RESOURCE_ALIAS "pause.png" ) + set_source_files_properties("../trafficlight-common/play.png" PROPERTIES QT_RESOURCE_ALIAS "play.png" ) + set_source_files_properties("../trafficlight-common/red.png" PROPERTIES QT_RESOURCE_ALIAS "red.png" ) + set_source_files_properties("../trafficlight-common/yellow.png" PROPERTIES QT_RESOURCE_ALIAS "yellow.png" ) + set(trafficlight-widgets-static_resource_files "../trafficlight-common/background.png" "../trafficlight-common/green.png" @@ -71,7 +69,6 @@ qt6_add_resources(trafficlight-widgets-static "trafficlight-widgets-static" ${trafficlight-widgets-static_resource_files} ) - # Statecharts: qt6_add_statecharts(trafficlight-widgets-static ../trafficlight-common/statemachine.scxml |