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: Idf2f3d5a09a496fa5c578bbeae84f3560549f1a9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>

8 files changed, 36 insertions, 89 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 27a9c2d..ac93b40 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from examples.pro.
-
 qt_examples_build_begin(EXTERNAL_BUILD)
 
 add_subdirectory(mqtt)
diff --git a/examples/mqtt/CMakeLists.txt b/examples/mqtt/CMakeLists.txt
index 0a0c91e..1a74da4 100644
--- a/examples/mqtt/CMakeLists.txt
+++ b/examples/mqtt/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from mqtt.pro.
-
 qt_internal_add_example(consolepubsub)
 if(TARGET Qt::Gui AND TARGET Qt::Widgets)
     qt_internal_add_example(simpleclient)
diff --git a/examples/mqtt/consolepubsub/CMakeLists.txt b/examples/mqtt/consolepubsub/CMakeLists.txt
index 42d41bd..af3aabe 100644
--- a/examples/mqtt/consolepubsub/CMakeLists.txt
+++ b/examples/mqtt/consolepubsub/CMakeLists.txt
@@ -1,36 +1,35 @@
-# Generated from consolepubsub.pro.
-
 cmake_minimum_required(VERSION 3.16)
-project(qtmqtt_pub LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+project(qtmqtt_pub_sub LANGUAGES CXX)
 
 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}/mqtt/consolepubsub")
 
-find_package(Qt6 COMPONENTS Mqtt)
+find_package(Qt6 REQUIRED COMPONENTS Mqtt)
+
+#
+# Pub
+#
 
 qt_add_executable(qtmqtt_pub
     configuration.h
     main_pub.cpp
 )
+
 set_target_properties(qtmqtt_pub PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_compile_definitions(qtmqtt_pub PUBLIC
     QT_DEPRECATED_WARNINGS
 )
 
 target_link_libraries(qtmqtt_pub PUBLIC
-    # Remove: gui
     Qt::Mqtt
 )
 
@@ -39,37 +38,26 @@ install(TARGETS qtmqtt_pub
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
-cmake_minimum_required(VERSION 3.16)
-project(qtmqtt_sub 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")
-endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/consolepubsub")
-
-find_package(Qt6 COMPONENTS Mqtt)
+#
+# Sub
+#
 
 qt_add_executable(qtmqtt_sub
     configuration.h
     main_sub.cpp
 )
+
 set_target_properties(qtmqtt_sub PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_compile_definitions(qtmqtt_sub PUBLIC
     QT_DEPRECATED_WARNINGS
 )
 
 target_link_libraries(qtmqtt_sub PUBLIC
-    # Remove: gui
     Qt::Mqtt
 )
 
diff --git a/examples/mqtt/quickpublication/CMakeLists.txt b/examples/mqtt/quickpublication/CMakeLists.txt
index bc18fff..7229b97 100644
--- a/examples/mqtt/quickpublication/CMakeLists.txt
+++ b/examples/mqtt/quickpublication/CMakeLists.txt
@@ -1,34 +1,26 @@
-# Generated from quickpublication.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(quickpublication 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}/mqtt/quickpublication")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Mqtt)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Mqtt Qml Quick)
 
 qt_add_executable(quickpublication
     main.cpp
     qmlmqttclient.cpp qmlmqttclient.h
 )
+
 set_target_properties(quickpublication PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_compile_definitions(quickpublication PUBLIC
     QT_DEPRECATED_WARNINGS
 )
@@ -41,7 +33,6 @@ target_link_libraries(quickpublication PUBLIC
     Qt::Quick
 )
 
-
 # Resources:
 set(qml_resource_files
     "main.qml"
diff --git a/examples/mqtt/quicksubscription/CMakeLists.txt b/examples/mqtt/quicksubscription/CMakeLists.txt
index 9e4ba60..4c7a4fe 100644
--- a/examples/mqtt/quicksubscription/CMakeLists.txt
+++ b/examples/mqtt/quicksubscription/CMakeLists.txt
@@ -1,34 +1,26 @@
-# Generated from quicksubscription.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(quicksubscription 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}/mqtt/quicksubscription")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Mqtt)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Mqtt Qml Quick)
 
 qt_add_executable(quicksubscription
     main.cpp
     qmlmqttclient.cpp qmlmqttclient.h
 )
+
 set_target_properties(quicksubscription PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_compile_definitions(quicksubscription PUBLIC
     QT_DEPRECATED_WARNINGS
 )
@@ -41,7 +33,6 @@ target_link_libraries(quicksubscription PUBLIC
     Qt::Quick
 )
 
-
 # Resources:
 set(qml_resource_files
     "main.qml"
diff --git a/examples/mqtt/simpleclient/CMakeLists.txt b/examples/mqtt/simpleclient/CMakeLists.txt
index df67b9a..35b112f 100644
--- a/examples/mqtt/simpleclient/CMakeLists.txt
+++ b/examples/mqtt/simpleclient/CMakeLists.txt
@@ -1,34 +1,27 @@
-# Generated from simpleclient.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(simplemqttclient 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}/mqtt/simpleclient")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Network)
-find_package(Qt6 COMPONENTS Mqtt)
-find_package(Qt6 COMPONENTS Widgets) # special case
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Mqtt Network Widgets)
 
 qt_add_executable(simplemqttclient
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
 )
+
 set_target_properties(simplemqttclient PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_compile_definitions(simplemqttclient PUBLIC
     QT_DEPRECATED_WARNINGS
 )
@@ -39,7 +32,8 @@ target_link_libraries(simplemqttclient PUBLIC
     Qt::Mqtt
     Qt::Network
 )
-target_link_libraries(simplemqttclient PUBLIC Qt::Widgets) # special case
+
+target_link_libraries(simplemqttclient PUBLIC Qt::Widgets)
 
 if((QT_MAJOR_VERSION GREATER 4))
     target_link_libraries(simplemqttclient PUBLIC
diff --git a/examples/mqtt/subscriptions/CMakeLists.txt b/examples/mqtt/subscriptions/CMakeLists.txt
index baeb7a0..6881b4f 100644
--- a/examples/mqtt/subscriptions/CMakeLists.txt
+++ b/examples/mqtt/subscriptions/CMakeLists.txt
@@ -1,35 +1,28 @@
-# Generated from subscriptions.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(mqttsubscriptions 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}/mqtt/subscriptions")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Network)
-find_package(Qt6 COMPONENTS Widgets)
-find_package(Qt6 COMPONENTS Mqtt)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Mqtt Network Widgets)
 
 qt_add_executable(mqttsubscriptions
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
     subscriptionwindow.cpp subscriptionwindow.h subscriptionwindow.ui
 )
+
 set_target_properties(mqttsubscriptions PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_compile_definitions(mqttsubscriptions PUBLIC
     QT_DEPRECATED_WARNINGS
 )
diff --git a/examples/mqtt/websocketsubscription/CMakeLists.txt b/examples/mqtt/websocketsubscription/CMakeLists.txt
index a280391..205279e 100644
--- a/examples/mqtt/websocketsubscription/CMakeLists.txt
+++ b/examples/mqtt/websocketsubscription/CMakeLists.txt
@@ -1,33 +1,27 @@
-# Generated from websocketsubscription.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(websocketsubscription 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}/mqtt/websocketsubscription")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS WebSockets)
-find_package(Qt6 COMPONENTS Mqtt)
+find_package(Qt6 REQUIRED COMPONENTS Core Mqtt WebSockets)
 
 qt_add_executable(websocketsubscription
     clientsubscription.cpp clientsubscription.h
     main.cpp
     websocketiodevice.cpp websocketiodevice.h
 )
+
 set_target_properties(websocketsubscription PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_compile_definitions(websocketsubscription PUBLIC
     QT_DEPRECATED_WARNINGS
 )