From d04f17bb72ba7020c63a9de5e10b0284bd166148 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 10 Sep 2023 21:32:48 +0200
Subject: [PATCH] CMake: re-jig required/optional reporting again

- Don't use the ${kfname} package itself, use it as a prefix for
  specific components of that package (e.g. ${kfname}CoreAddons)
- Use TYPE to indicate required packages, rather than using
  REQUIRED in the find_package call, to more-helpfully collect
  missing requirements.
---
 CMakeLists.txt | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7e121a65..7aa1f3060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,12 +317,22 @@ if(WITH_QML)
 endif()
 # Note that some modules need more Qt modules, optionally.
 
-find_package(YAMLCPP ${YAMLCPP_VERSION} REQUIRED)
+find_package(YAMLCPP ${YAMLCPP_VERSION})
+set_package_properties(
+    YAMLCPP
+    PROPERTIES
+    TYPE REQUIRED
+    DESCRIPTION "YAML parser for C++"
+    PURPOSE "Parsing of configuration files"
+)
+
+find_package(Polkit${qtname}-1)
 if(INSTALL_POLKIT)
-    find_package(Polkit${qtname}-1 REQUIRED)
-else()
-    # Find it anyway, for dependencies-reporting
-    find_package(Polkit${qtname}-1)
+    set_package_properties(
+        Polkit${qtname}-1
+        PROPERTIES
+        TYPE REQUIRED
+    )
 endif()
 set_package_properties(
     Polkit${qtname}-1
@@ -348,15 +358,38 @@ if(ECM_FOUND)
     include(KDEInstallDirs)
 endif()
 
-find_package(${kfname}CoreAddons ${KF_VERSION} QUIET REQUIRED)
+find_package(${kfname}CoreAddons ${KF_VERSION} QUIET)
+set_package_properties(
+    ${kfname}CoreAddons
+    PROPERTIES
+    TYPE REQUIRED
+    DESCRIPTION "KDE Framework CoreAddons"
+    URL "https://api.kde.org/frameworks/"
+    PURPOSE "Essential Framework for AboutData and Macros"
+)
+
 # After this point, there should be no REQUIRED find_packages,
 # since we want tidy reporting of optional dependencies.
+feature_summary(
+    WHAT REQUIRED_PACKAGES_NOT_FOUND
+    FATAL_ON_MISSING_REQUIRED_PACKAGES
+    DESCRIPTION "The following REQUIRED packages were not found:"
+    QUIET_ON_EMPTY
+)
 
 #
 # OPTIONAL DEPENDENCIES
 #
 # First, set KF back to optional so that any missing components don't trip us up.
 find_package(${kfname}Crash ${KF_VERSION} QUIET)
+set_package_properties(
+    ${kfname}Crash
+    PROPERTIES
+    TYPE OPTIONAL
+    DESCRIPTION "KDE Framework Crash"
+    URL "https://api.kde.org/frameworks/"
+    PURPOSE "Framework for sending Crash Dumps"
+)
 
 if(NOT TARGET ${kfname}::Crash)
     if(BUILD_CRASH_REPORTING)