Improve examples CMakeLists.txt

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

8 files changed, 34 insertions, 70 deletions

diff --git a/examples/bluetooth/btchat/CMakeLists.txt b/examples/bluetooth/btchat/CMakeLists.txt
index e06631d1..1cce8bf8 100644
--- a/examples/bluetooth/btchat/CMakeLists.txt
+++ b/examples/bluetooth/btchat/CMakeLists.txt
@@ -1,21 +1,16 @@
 cmake_minimum_required(VERSION 3.16)
 project(btchat 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}/bluetooth/btchat")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Bluetooth)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core Widgets)
 
 qt_add_executable(btchat
     chat.cpp chat.h chat.ui
@@ -24,10 +19,12 @@ qt_add_executable(btchat
     main.cpp
     remoteselector.cpp remoteselector.h remoteselector.ui
 )
+
 set_target_properties(btchat PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(btchat PUBLIC
     Qt::Bluetooth
     Qt::Core
diff --git a/examples/bluetooth/btscanner/CMakeLists.txt b/examples/bluetooth/btscanner/CMakeLists.txt
index 7b8caa25..18c9ff94 100644
--- a/examples/bluetooth/btscanner/CMakeLists.txt
+++ b/examples/bluetooth/btscanner/CMakeLists.txt
@@ -1,27 +1,23 @@
 cmake_minimum_required(VERSION 3.16)
 project(btscanner 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}/bluetooth/btscanner")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Bluetooth)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core Widgets)
 
 qt_add_executable(btscanner
     device.cpp device.h device.ui
     main.cpp
     service.cpp service.h service.ui
 )
+
 set_target_properties(btscanner PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
diff --git a/examples/bluetooth/heartrate-game/CMakeLists.txt b/examples/bluetooth/heartrate-game/CMakeLists.txt
index 46401964..341b7d4d 100644
--- a/examples/bluetooth/heartrate-game/CMakeLists.txt
+++ b/examples/bluetooth/heartrate-game/CMakeLists.txt
@@ -1,23 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 project(heartrate-game 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}/bluetooth/heartrate-game")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Bluetooth)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core Gui Qml Quick)
 
 qt_add_executable(heartrate-game
     bluetoothbaseclass.cpp bluetoothbaseclass.h
@@ -28,10 +20,12 @@ qt_add_executable(heartrate-game
     heartrate-global.h
     main.cpp
 )
+
 set_target_properties(heartrate-game PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(heartrate-game PUBLIC
     Qt::Bluetooth
     Qt::Core
@@ -78,6 +72,7 @@ qt6_add_resources(heartrate-game "qml"
     FILES
         ${qml_resource_files}
 )
+
 set(images_resource_files
     "qml/images/bt_off_to_on.png"
     "qml/images/heart.png"
diff --git a/examples/bluetooth/heartrate-server/CMakeLists.txt b/examples/bluetooth/heartrate-server/CMakeLists.txt
index 11a3bfe9..3b8efd54 100644
--- a/examples/bluetooth/heartrate-server/CMakeLists.txt
+++ b/examples/bluetooth/heartrate-server/CMakeLists.txt
@@ -1,31 +1,29 @@
 cmake_minimum_required(VERSION 3.16)
 project(heartrate-server 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}/bluetooth/heartrate-server")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Bluetooth)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core)
+
 if(ANDROID)
-    find_package(Qt6 COMPONENTS Gui)
+    find_package(Qt6 REQUIRED COMPONENTS Gui)
 endif()
 
 qt_add_executable(heartrate-server
     main.cpp
 )
+
 set_target_properties(heartrate-server PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(heartrate-server PUBLIC
     Qt::Bluetooth
     Qt::Core
@@ -51,7 +49,6 @@ if (APPLE)
     endif()
 endif()
 
-
 install(TARGETS heartrate-server
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/bluetooth/lowenergyscanner/CMakeLists.txt b/examples/bluetooth/lowenergyscanner/CMakeLists.txt
index 64a41e8d..41a6a7a9 100644
--- a/examples/bluetooth/lowenergyscanner/CMakeLists.txt
+++ b/examples/bluetooth/lowenergyscanner/CMakeLists.txt
@@ -1,22 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 project(lowenergyscanner 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}/bluetooth/lowenergyscanner")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Bluetooth)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core Gui Quick)
 
 qt_add_executable(lowenergyscanner
     characteristicinfo.cpp characteristicinfo.h
@@ -25,10 +18,12 @@ qt_add_executable(lowenergyscanner
     main.cpp
     serviceinfo.cpp serviceinfo.h
 )
+
 set_target_properties(lowenergyscanner PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_include_directories(lowenergyscanner PUBLIC
     .
 )
@@ -54,7 +49,6 @@ if (APPLE)
     endif()
 endif()
 
-
 # Resources:
 set(resources_resource_files
     "assets/Characteristics.qml"
diff --git a/examples/bluetooth/pingpong/CMakeLists.txt b/examples/bluetooth/pingpong/CMakeLists.txt
index c406ab3f..914b9ba8 100644
--- a/examples/bluetooth/pingpong/CMakeLists.txt
+++ b/examples/bluetooth/pingpong/CMakeLists.txt
@@ -1,32 +1,27 @@
 cmake_minimum_required(VERSION 3.16)
 project(btpingpong 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}/bluetooth/pingpong")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Bluetooth)
+find_package(Qt6 REQUIRED COMPONENTS Bluetooth Core Gui Quick)
 
 qt_add_executable(btpingpong
     main.cpp
     pingpong.cpp pingpong.h
 )
+
 set_target_properties(btpingpong PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
     OUTPUT_NAME "pingpong"
 )
+
 target_link_libraries(btpingpong PUBLIC
     Qt::Bluetooth
     Qt::Core
@@ -34,7 +29,6 @@ target_link_libraries(btpingpong PUBLIC
     Qt::Quick
 )
 
-
 # Resources:
 set(resource_resource_files
     "assets/Board.qml"
diff --git a/examples/nfc/annotatedurl/CMakeLists.txt b/examples/nfc/annotatedurl/CMakeLists.txt
index cde26cf8..70ad25ab 100644
--- a/examples/nfc/annotatedurl/CMakeLists.txt
+++ b/examples/nfc/annotatedurl/CMakeLists.txt
@@ -1,22 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 project(annotatedurl 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}/nfc/annotatedurl")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Nfc)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Nfc Widgets)
 
 qt_add_executable(annotatedurl
     MANUAL_FINALIZATION
@@ -24,10 +17,12 @@ qt_add_executable(annotatedurl
     main.cpp
     mainwindow.cpp mainwindow.h
 )
+
 set_target_properties(annotatedurl PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(annotatedurl PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/nfc/ndefeditor/CMakeLists.txt b/examples/nfc/ndefeditor/CMakeLists.txt
index ca715864..c05da2d5 100644
--- a/examples/nfc/ndefeditor/CMakeLists.txt
+++ b/examples/nfc/ndefeditor/CMakeLists.txt
@@ -1,22 +1,16 @@
 cmake_minimum_required(VERSION 3.16)
 project(ndefeditor 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}/nfc/ndefeditor")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Nfc)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Nfc Widgets)
 
 qt_add_executable(ndefeditor
     MANUAL_FINALIZATION
@@ -26,10 +20,12 @@ qt_add_executable(ndefeditor
     textrecordeditor.cpp textrecordeditor.h textrecordeditor.ui
     urirecordeditor.cpp urirecordeditor.h urirecordeditor.ui
 )
+
 set_target_properties(ndefeditor PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(ndefeditor PUBLIC
     Qt::Core
     Qt::Gui