napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: try to work around KF5 staying 'required' at the end

Browse Source 
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.
This commit is contained in:
Adriaan de Groot 2023-09-08 21:33:46 +02:00
parent 7f51aac81b
commit c2e4ba324f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -369,12 +369,15 @@ feature_summary(
# OPTIONAL DEPENDENCIES # OPTIONAL DEPENDENCIES
# #
# First, set KF back to optional so that any missing components don't trip us up. # 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( set_package_properties(
${kfname} ${kfname}
PROPERTIES PROPERTIES
TYPE OPTIONAL 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(NOT TARGET ${kfname}::Crash)
if(BUILD_CRASH_REPORTING) 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(Polkit ${INSTALL_POLKIT} "Install Polkit files")
add_feature_info(KCrash ${BUILD_CRASH_REPORTING} "Crash dumps via KCrash") 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 ### CMake infrastructure installation
# #
# #