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>

18 files changed, 112 insertions, 169 deletions

diff --git a/examples/scxml/CMakeLists.txt b/examples/scxml/CMakeLists.txt
index aca06ab..3560e53 100644
--- a/examples/scxml/CMakeLists.txt
+++ b/examples/scxml/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from scxml.pro.
-
 if (TARGET Qt::Network AND QT_FEATURE_scxml_ecmascriptdatamodel)
     qt_internal_add_example(ftpclient)
 endif()
diff --git a/examples/scxml/calculator-qml/CMakeLists.txt b/examples/scxml/calculator-qml/CMakeLists.txt
index 7108230..6545e47 100644
--- a/examples/scxml/calculator-qml/CMakeLists.txt
+++ b/examples/scxml/calculator-qml/CMakeLists.txt
@@ -1,32 +1,25 @@
-# Generated from calculator-qml.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(calculator-qml 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/calculator-qml")
 
-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(calculator-qml
     calculator-qml.cpp
 )
+
 set_target_properties(calculator-qml PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(calculator-qml PUBLIC
     Qt::Core
     Qt::Gui
@@ -34,7 +27,6 @@ target_link_libraries(calculator-qml PUBLIC
     Qt::Scxml
 )
 
-
 # Resources:
 set(calculator-qml_resource_files
     "Button.qml"
@@ -48,7 +40,6 @@ qt6_add_resources(calculator-qml "calculator-qml"
         ${calculator-qml_resource_files}
 )
 
-
 # Statecharts:
 qt6_add_statecharts(calculator-qml
     ../calculator-common/statemachine.scxml
diff --git a/examples/scxml/calculator-widgets/CMakeLists.txt b/examples/scxml/calculator-widgets/CMakeLists.txt
index e9704c9..4e9db81 100644
--- a/examples/scxml/calculator-widgets/CMakeLists.txt
+++ b/examples/scxml/calculator-widgets/CMakeLists.txt
@@ -1,30 +1,27 @@
-# Generated from calculator-widgets.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(calculator-widgets 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/calculator-widgets")
 
-find_package(Qt6 COMPONENTS Core Gui Widgets Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Scxml Widgets)
 
 qt_add_executable(calculator-widgets
     calculator-widgets.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
 )
+
 set_target_properties(calculator-widgets PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(calculator-widgets PUBLIC
     Qt6::Core
     Qt6::Gui
diff --git a/examples/scxml/ftpclient/CMakeLists.txt b/examples/scxml/ftpclient/CMakeLists.txt
index 536d2d3..eb1af76 100644
--- a/examples/scxml/ftpclient/CMakeLists.txt
+++ b/examples/scxml/ftpclient/CMakeLists.txt
@@ -1,31 +1,27 @@
-# Generated from ftpclient.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(ftpclient 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/ftpclient")
 
-find_package(Qt6 COMPONENTS Core Scxml Network)
+find_package(Qt6 REQUIRED COMPONENTS Core Network Scxml)
 
 qt_add_executable(ftpclient
     ftpcontrolchannel.cpp ftpcontrolchannel.h
     ftpdatachannel.cpp ftpdatachannel.h
     main.cpp
 )
+
 set_target_properties(ftpclient PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(ftpclient PUBLIC
     Qt6::Core
     Qt6::Network
diff --git a/examples/scxml/invoke-dynamic/CMakeLists.txt b/examples/scxml/invoke-dynamic/CMakeLists.txt
index 9647edc..d187195 100644
--- a/examples/scxml/invoke-dynamic/CMakeLists.txt
+++ b/examples/scxml/invoke-dynamic/CMakeLists.txt
@@ -1,29 +1,25 @@
-# Generated from invoke-dynamic.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(invoke-dynamic 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/invoke-dynamic")
 
-find_package(Qt6 COMPONENTS Core Gui Qml Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml)
 
 qt_add_executable(invoke-dynamic
     invoke-dynamic.cpp
 )
+
 set_target_properties(invoke-dynamic PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(invoke-dynamic PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -35,15 +31,19 @@ target_link_libraries(invoke-dynamic PUBLIC
 set_source_files_properties("../invoke-common/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
 )
+
 set_source_files_properties("../invoke-common/MainView.qml"
     PROPERTIES QT_RESOURCE_ALIAS "MainView.qml"
 )
+
 set_source_files_properties("../invoke-common/SubView.qml"
     PROPERTIES QT_RESOURCE_ALIAS "SubView.qml"
 )
+
 set_source_files_properties("../invoke-common/statemachine.scxml"
     PROPERTIES QT_RESOURCE_ALIAS "statemachine.scxml"
 )
+
 set(invoke-dynamic_resource_files
     "../invoke-common/Button.qml"
     "../invoke-common/MainView.qml"
diff --git a/examples/scxml/invoke-static/CMakeLists.txt b/examples/scxml/invoke-static/CMakeLists.txt
index cf162b7..5e4130e 100644
--- a/examples/scxml/invoke-static/CMakeLists.txt
+++ b/examples/scxml/invoke-static/CMakeLists.txt
@@ -1,29 +1,25 @@
-# Generated from invoke-static.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(invoke-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/invoke-static")
 
-find_package(Qt6 COMPONENTS Core Gui Qml Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml)
 
 qt_add_executable(invoke-static
     invoke-static.cpp
 )
+
 set_target_properties(invoke-static PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(invoke-static PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -35,12 +31,15 @@ target_link_libraries(invoke-static PUBLIC
 set_source_files_properties("../invoke-common/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
 )
+
 set_source_files_properties("../invoke-common/MainView.qml"
     PROPERTIES QT_RESOURCE_ALIAS "MainView.qml"
 )
+
 set_source_files_properties("../invoke-common/SubView.qml"
     PROPERTIES QT_RESOURCE_ALIAS "SubView.qml"
 )
+
 set(invoke-static_resource_files
     "../invoke-common/Button.qml"
     "../invoke-common/MainView.qml"
@@ -55,7 +54,6 @@ qt6_add_resources(invoke-static "invoke-static"
         ${invoke-static_resource_files}
 )
 
-
 # Statecharts:
 qt6_add_statecharts(invoke-static
     ../invoke-common/statemachine.scxml
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
diff --git a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt
index 02ba676..facb831 100644
--- a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt
+++ b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt
@@ -1,29 +1,25 @@
-# Generated from mediaplayer-qml-dynamic.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(mediaplayer-qml-dynamic 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-dynamic")
 
-find_package(Qt6 COMPONENTS Core Gui Qml Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml)
 
 qt_add_executable(mediaplayer-qml-dynamic
     mediaplayer-qml-dynamic.cpp
 )
+
 set_target_properties(mediaplayer-qml-dynamic PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(mediaplayer-qml-dynamic PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -35,9 +31,11 @@ target_link_libraries(mediaplayer-qml-dynamic PUBLIC
 set_source_files_properties("../mediaplayer-common/Mediaplayer.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml"
 )
+
 set_source_files_properties("../mediaplayer-common/mediaplayer.scxml"
     PROPERTIES QT_RESOURCE_ALIAS "mediaplayer.scxml"
 )
+
 set(mediaplayer-qml-dynamic_resource_files
     "../mediaplayer-common/Mediaplayer.qml"
     "../mediaplayer-common/mediaplayer.scxml"
diff --git a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt
index 76e9ce3..054e31c 100644
--- a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt
+++ b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt
@@ -1,32 +1,25 @@
-# Generated from mediaplayer-qml-static.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(mediaplayer-qml-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/mediaplayer-qml-static")
 
-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-static
     mediaplayer-qml-static.cpp
 )
+
 set_target_properties(mediaplayer-qml-static PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(mediaplayer-qml-static PUBLIC
     Qt::Core
     Qt::Gui
@@ -34,11 +27,11 @@ target_link_libraries(mediaplayer-qml-static PUBLIC
     Qt::Scxml
 )
 
-
 # Resources:
 set_source_files_properties("../mediaplayer-common/Mediaplayer.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml"
 )
+
 set(mediaplayer-qml-static_resource_files
     "../mediaplayer-common/Mediaplayer.qml"
     "mediaplayer-qml-static.qml"
@@ -51,7 +44,6 @@ qt6_add_resources(mediaplayer-qml-static "mediaplayer-qml-static"
         ${mediaplayer-qml-static_resource_files}
 )
 
-
 # Statecharts:
 qt6_add_statecharts(mediaplayer-qml-static
     ../mediaplayer-common/mediaplayer.scxml
diff --git a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt
index 5c24c9e..75a3c9f 100644
--- a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt
+++ b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt
@@ -1,30 +1,27 @@
-# Generated from mediaplayer-widgets-dynamic.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(mediaplayer-widgets-dynamic 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-widgets-dynamic")
 
-find_package(Qt6 COMPONENTS Core Gui Widgets Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Scxml Widgets)
 
 qt_add_executable(mediaplayer-widgets-dynamic
     ../mediaplayer-common/mainwindow.cpp ../mediaplayer-common/mainwindow.h ../mediaplayer-common/mainwindow.ui
     mediaplayer-widgets-dynamic.cpp
 )
+
 set_target_properties(mediaplayer-widgets-dynamic PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(mediaplayer-widgets-dynamic PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -36,6 +33,7 @@ target_link_libraries(mediaplayer-widgets-dynamic PUBLIC
 set_source_files_properties("../mediaplayer-common/mediaplayer.scxml"
     PROPERTIES QT_RESOURCE_ALIAS "mediaplayer.scxml"
 )
+
 set(mediaplayer_resource_files
     "../mediaplayer-common/mediaplayer.scxml"
 )
diff --git a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt
index a3c8b42..63f7d1f 100644
--- a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt
+++ b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt
@@ -1,30 +1,27 @@
-# Generated from mediaplayer-widgets-static.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(mediaplayer-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/mediaplayer-widgets-static")
 
-find_package(Qt6 COMPONENTS Core Gui Widgets Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Scxml Widgets)
 
 qt_add_executable(mediaplayer-widgets-static
     ../mediaplayer-common/mainwindow.cpp ../mediaplayer-common/mainwindow.h ../mediaplayer-common/mainwindow.ui
     mediaplayer-widgets-static.cpp
 )
+
 set_target_properties(mediaplayer-widgets-static PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(mediaplayer-widgets-static PUBLIC
     Qt6::Core
     Qt6::Gui
diff --git a/examples/scxml/pinball/CMakeLists.txt b/examples/scxml/pinball/CMakeLists.txt
index 1966d38..04dfe2f 100644
--- a/examples/scxml/pinball/CMakeLists.txt
+++ b/examples/scxml/pinball/CMakeLists.txt
@@ -1,33 +1,27 @@
-# Generated from pinball.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(pinball 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/pinball")
 
-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(pinball
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
 )
+
 set_target_properties(pinball PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(pinball PUBLIC
     Qt::Core
     Qt::Gui
@@ -35,7 +29,6 @@ target_link_libraries(pinball PUBLIC
     Qt::Widgets
 )
 
-
 # Statecharts:
 qt6_add_statecharts(pinball
     pinball.scxml
diff --git a/examples/scxml/sudoku/CMakeLists.txt b/examples/scxml/sudoku/CMakeLists.txt
index 985281e..8a0f848 100644
--- a/examples/scxml/sudoku/CMakeLists.txt
+++ b/examples/scxml/sudoku/CMakeLists.txt
@@ -1,33 +1,26 @@
-# Generated from sudoku.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(sudoku 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/sudoku")
 
-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(sudoku
     main.cpp
     mainwindow.cpp mainwindow.h
 )
+
 set_target_properties(sudoku PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(sudoku PUBLIC
     Qt::Core
     Qt::Gui
@@ -35,7 +28,6 @@ target_link_libraries(sudoku PUBLIC
     Qt::Widgets
 )
 
-
 # Resources:
 set(sudoku_resource_files
     "data/nearly-solved-sudoku.data"
@@ -50,7 +42,6 @@ qt6_add_resources(sudoku "sudoku"
         ${sudoku_resource_files}
 )
 
-
 # Statecharts:
 qt6_add_statecharts(sudoku
     sudoku.scxml
diff --git a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt
index 776d72d..d285d93 100644
--- a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt
+++ b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt
@@ -1,29 +1,26 @@
-# Generated from trafficlight-qml-dynamic.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(trafficlight-qml-dynamic 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-dynamic")
 
-find_package(Qt6 COMPONENTS Core Gui Qml Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml)
 
 qt_add_executable(trafficlight-qml-dynamic
     trafficlight-qml-dynamic.cpp
 )
+
 set_target_properties(trafficlight-qml-dynamic PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(trafficlight-qml-dynamic PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -31,38 +28,47 @@ target_link_libraries(trafficlight-qml-dynamic PUBLIC
     Qt6::Scxml
 )
 
-
 # Resources:
 set_source_files_properties("../trafficlight-common/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
 )
+
 set_source_files_properties("../trafficlight-common/Lights.ui.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Lights.ui.qml"
 )
+
 set_source_files_properties("../trafficlight-common/TrafficLight.qml"
     PROPERTIES QT_RESOURCE_ALIAS "TrafficLight.qml"
 )
+
 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/statemachine.scxml"
     PROPERTIES QT_RESOURCE_ALIAS "statemachine.scxml"
 )
+
 set_source_files_properties("../trafficlight-common/yellow.png"
     PROPERTIES QT_RESOURCE_ALIAS "yellow.png"
 )
+
 set(trafficlight-qml-dynamic_resource_files
     "../trafficlight-common/Button.qml"
     "../trafficlight-common/Lights.ui.qml"
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
diff --git a/examples/scxml/trafficlight-qml-static/CMakeLists.txt b/examples/scxml/trafficlight-qml-static/CMakeLists.txt
index 05c6304..20b29c5 100644
--- a/examples/scxml/trafficlight-qml-static/CMakeLists.txt
+++ b/examples/scxml/trafficlight-qml-static/CMakeLists.txt
@@ -1,29 +1,26 @@
-# Generated from trafficlight-qml-static.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(trafficlight-qml-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-qml-static")
 
-find_package(Qt6 COMPONENTS Core Gui Qml Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml)
 
 qt_add_executable(trafficlight-qml-static
     trafficlight-qml-static.cpp
 )
+
 set_target_properties(trafficlight-qml-static PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(trafficlight-qml-static PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -31,35 +28,43 @@ target_link_libraries(trafficlight-qml-static PUBLIC
     Qt6::Scxml
 )
 
-
 # Resources:
 set_source_files_properties("../trafficlight-common/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
 )
+
 set_source_files_properties("../trafficlight-common/Lights.ui.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Lights.ui.qml"
 )
+
 set_source_files_properties("../trafficlight-common/TrafficLight.qml"
     PROPERTIES QT_RESOURCE_ALIAS "TrafficLight.qml"
 )
+
 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-qml-static_resource_files
     "../trafficlight-common/Button.qml"
     "../trafficlight-common/Lights.ui.qml"
@@ -80,7 +85,6 @@ qt6_add_resources(trafficlight-qml-static "trafficlight-qml-static"
         ${trafficlight-qml-static_resource_files}
 )
 
-
 # Statecharts:
 qt6_add_statecharts(trafficlight-qml-static
     ../trafficlight-common/statemachine.scxml
diff --git a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt
index 450c607..7b8c0a2 100644
--- a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt
+++ b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt
@@ -1,30 +1,26 @@
-# Generated from trafficlight-widgets-dynamic.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(trafficlight-widgets-dynamic 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-dynamic")
 
-find_package(Qt6 COMPONENTS Core Gui Widgets Scxml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Scxml Widgets)
 
 qt_add_executable(trafficlight-widgets-dynamic
     ../trafficlight-common/trafficlight.cpp ../trafficlight-common/trafficlight.h
     trafficlight-widgets-dynamic.cpp
 )
+
 set_target_properties(trafficlight-widgets-dynamic PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(trafficlight-widgets-dynamic PUBLIC
     Qt6::Core
     Qt6::Gui
@@ -32,29 +28,35 @@ target_link_libraries(trafficlight-widgets-dynamic PUBLIC
     Qt6::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/statemachine.scxml"
     PROPERTIES QT_RESOURCE_ALIAS "statemachine.scxml"
 )
+
 set_source_files_properties("../trafficlight-common/yellow.png"
     PROPERTIES QT_RESOURCE_ALIAS "yellow.png"
 )
+
 set(trafficlight-widgets-dynamic_resource_files
     "../trafficlight-common/background.png"
     "../trafficlight-common/green.png"
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