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

9 files changed, 28 insertions, 70 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index afa018c..f1e09c7 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(websockets)
diff --git a/examples/websockets/CMakeLists.txt b/examples/websockets/CMakeLists.txt
index c608f0b..b16f64d 100644
--- a/examples/websockets/CMakeLists.txt
+++ b/examples/websockets/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from websockets.pro.
-
 qt_internal_add_example(echoclient)
 qt_internal_add_example(echoserver)
 qt_internal_add_example(simplechat)
diff --git a/examples/websockets/echoclient/CMakeLists.txt b/examples/websockets/echoclient/CMakeLists.txt
index 4166071..e366612 100644
--- a/examples/websockets/echoclient/CMakeLists.txt
+++ b/examples/websockets/echoclient/CMakeLists.txt
@@ -1,31 +1,26 @@
-# Generated from echoclient.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(echoclient 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}/websockets/echoclient")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS Core WebSockets)
 
 qt_add_executable(echoclient
     echoclient.cpp echoclient.h
     main.cpp
 )
+
 set_target_properties(echoclient PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(echoclient PUBLIC
     Qt::Core
     Qt::WebSockets
diff --git a/examples/websockets/echoserver/CMakeLists.txt b/examples/websockets/echoserver/CMakeLists.txt
index 1ba784e..4781d91 100644
--- a/examples/websockets/echoserver/CMakeLists.txt
+++ b/examples/websockets/echoserver/CMakeLists.txt
@@ -1,30 +1,26 @@
-# Generated from echoserver.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(echoserver 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}/websockets/echoserver")
 
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS WebSockets)
 
 qt_add_executable(echoserver
     echoserver.cpp echoserver.h
     main.cpp
 )
+
 set_target_properties(echoserver PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(echoserver PUBLIC
     Qt::WebSockets
 )
diff --git a/examples/websockets/qmlwebsocketclient/CMakeLists.txt b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
index 959dd90..7c99ae7 100644
--- a/examples/websockets/qmlwebsocketclient/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
@@ -1,32 +1,25 @@
-# Generated from qmlwebsocketclient.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(qmlwebsocketclient 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}/websockets/qmlwebsocketclient")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick WebSockets)
 
 qt_add_executable(qmlwebsocketclient
     main.cpp
 )
+
 set_target_properties(qmlwebsocketclient PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(qmlwebsocketclient PUBLIC
     Qt::Core
     Qt::Gui
@@ -34,7 +27,6 @@ target_link_libraries(qmlwebsocketclient PUBLIC
     Qt::WebSockets
 )
 
-
 # Resources:
 set(data_resource_files
     "qml/qmlwebsocketclient/main.qml"
diff --git a/examples/websockets/qmlwebsocketserver/CMakeLists.txt b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
index a9b14fc..1f93cb4 100644
--- a/examples/websockets/qmlwebsocketserver/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
@@ -1,32 +1,25 @@
-# Generated from qmlwebsocketserver.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(qmlwebsocketserver 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}/websockets/qmlwebsocketserver")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick WebSockets)
 
 qt_add_executable(qmlwebsocketserver
     main.cpp
 )
+
 set_target_properties(qmlwebsocketserver PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(qmlwebsocketserver PUBLIC
     Qt::Core
     Qt::Gui
@@ -34,7 +27,6 @@ target_link_libraries(qmlwebsocketserver PUBLIC
     Qt::WebSockets
 )
 
-
 # Resources:
 set(data_resource_files
     "qml/qmlwebsocketserver/main.qml"
diff --git a/examples/websockets/simplechat/CMakeLists.txt b/examples/websockets/simplechat/CMakeLists.txt
index e69e3b7..0b6237b 100644
--- a/examples/websockets/simplechat/CMakeLists.txt
+++ b/examples/websockets/simplechat/CMakeLists.txt
@@ -1,30 +1,26 @@
-# Generated from simplechat.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(simplechatserver 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}/websockets/simplechat")
 
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS WebSockets)
 
 qt_add_executable(simplechatserver
     chatserver.cpp chatserver.h
     main.cpp
 )
+
 set_target_properties(simplechatserver PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(simplechatserver PUBLIC
     Qt::WebSockets
 )
diff --git a/examples/websockets/sslechoclient/CMakeLists.txt b/examples/websockets/sslechoclient/CMakeLists.txt
index 26a1d05..3723e38 100644
--- a/examples/websockets/sslechoclient/CMakeLists.txt
+++ b/examples/websockets/sslechoclient/CMakeLists.txt
@@ -1,30 +1,26 @@
-# Generated from sslechoclient.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(sslechoclient 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}/websockets/sslechoclient")
 
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS WebSockets)
 
 qt_add_executable(sslechoclient
     main.cpp
     sslechoclient.cpp sslechoclient.h
 )
+
 set_target_properties(sslechoclient PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(sslechoclient PUBLIC
     Qt::WebSockets
 )
diff --git a/examples/websockets/sslechoserver/CMakeLists.txt b/examples/websockets/sslechoserver/CMakeLists.txt
index 1803f9c..d977626 100644
--- a/examples/websockets/sslechoserver/CMakeLists.txt
+++ b/examples/websockets/sslechoserver/CMakeLists.txt
@@ -1,35 +1,30 @@
-# Generated from sslechoserver.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(sslechoserver 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}/websockets/sslechoserver")
 
-find_package(Qt6 COMPONENTS WebSockets)
+find_package(Qt6 REQUIRED COMPONENTS WebSockets)
 
 qt_add_executable(sslechoserver
     main.cpp
     sslechoserver.cpp sslechoserver.h
 )
+
 set_target_properties(sslechoserver PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE FALSE
 )
+
 target_link_libraries(sslechoserver PUBLIC
     Qt::WebSockets
 )
 
-
 # Resources:
 set(securesocketclient_resource_files
     "localhost.cert"