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

4 files changed, 12 insertions, 38 deletions

diff --git a/examples/svg/embedded/CMakeLists.txt b/examples/svg/embedded/CMakeLists.txt
index c52cbe2..7c52f1c 100644
--- a/examples/svg/embedded/CMakeLists.txt
+++ b/examples/svg/embedded/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from embedded.pro.
-
 if(TARGET Qt::Widgets)
     qt_internal_add_example(desktopservices)
 endif()
diff --git a/examples/svg/embedded/desktopservices/CMakeLists.txt b/examples/svg/embedded/desktopservices/CMakeLists.txt
index 00a20f7..1534356 100644
--- a/examples/svg/embedded/desktopservices/CMakeLists.txt
+++ b/examples/svg/embedded/desktopservices/CMakeLists.txt
@@ -1,23 +1,15 @@
-# Generated from desktopservices.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(desktopservices 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}/svg/embedded/desktopservices")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(desktopservices
     contenttab.cpp contenttab.h
@@ -25,17 +17,18 @@ qt_add_executable(desktopservices
     linktab.cpp linktab.h
     main.cpp
 )
+
 set_target_properties(desktopservices PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(desktopservices PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
 )
 
-
 # Resources:
 set(desktopservices_resource_files
     "resources/browser.png"
diff --git a/examples/svg/embedded/fluidlauncher/CMakeLists.txt b/examples/svg/embedded/fluidlauncher/CMakeLists.txt
index 1fc671c..7d66bf6 100644
--- a/examples/svg/embedded/fluidlauncher/CMakeLists.txt
+++ b/examples/svg/embedded/fluidlauncher/CMakeLists.txt
@@ -1,23 +1,15 @@
-# Generated from fluidlauncher.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(fluidlauncher 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}/svg/embedded/fluidlauncher")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(fluidlauncher
     demoapplication.cpp demoapplication.h
@@ -26,17 +18,18 @@ qt_add_executable(fluidlauncher
     pictureflow.cpp pictureflow.h
     slideshow.cpp slideshow.h
 )
+
 set_target_properties(fluidlauncher PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(fluidlauncher PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
 )
 
-
 # Resources:
 set(fluidlauncher_resource_files
     "config.xml"
diff --git a/examples/svg/embedded/weatherinfo/CMakeLists.txt b/examples/svg/embedded/weatherinfo/CMakeLists.txt
index c87887e..44b24bd 100644
--- a/examples/svg/embedded/weatherinfo/CMakeLists.txt
+++ b/examples/svg/embedded/weatherinfo/CMakeLists.txt
@@ -1,34 +1,25 @@
-# Generated from weatherinfo.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(svgweatherinfo 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}/svg/embedded/weatherinfo")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Network)
-find_package(Qt6 COMPONENTS Widgets)
-find_package(Qt6 COMPONENTS Svg)
-find_package(Qt6 COMPONENTS SvgWidgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Svg SvgWidgets Widgets)
 
 qt_add_executable(svgweatherinfo
     weatherinfo.cpp
 )
+
 set_target_properties(svgweatherinfo PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(svgweatherinfo PUBLIC
     Qt::Core
     Qt::Gui
@@ -38,7 +29,6 @@ target_link_libraries(svgweatherinfo PUBLIC
     Qt::Widgets
 )
 
-
 # Resources:
 set(weatherinfo_resource_files
     "icons/weather-few-clouds.svg"