From c2e4ba324f7952c25880d21efcc3b0dc46bc7c2a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 8 Sep 2023 21:33:46 +0200 Subject: [PATCH] CI: try to work around KF5 staying 'required' at the end The find_package() in the plasmalnf module seems to mark KF5 as not-found, because one component is not found right then -- after that, CMake-time fails because KF5 is still-required and not-found. --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb9d39b10..30bc232d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -369,12 +369,15 @@ feature_summary( # OPTIONAL DEPENDENCIES # # First, set KF back to optional so that any missing components don't trip us up. +find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons Crash) set_package_properties( ${kfname} PROPERTIES TYPE OPTIONAL + DESCRIPTION "KDE Frameworks" + URL "https://api.kde.org/frameworks/" + PURPOSE "KDE Integration" ) -find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons Crash) if(NOT TARGET ${kfname}::Crash) if(BUILD_CRASH_REPORTING) @@ -583,6 +586,11 @@ add_feature_info(Qml ${WITH_QML} "QML UI support") add_feature_info(Polkit ${INSTALL_POLKIT} "Install Polkit files") add_feature_info(KCrash ${BUILD_CRASH_REPORTING} "Crash dumps via KCrash") +### Post-source configuration +# +# +find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons Crash) + ### CMake infrastructure installation # #