From 2eff5f74a5792f5e7792e1694927153440efcdf5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 5 Sep 2023 23:04:43 +0200 Subject: [PATCH] plasmalnf: not compatible with Qt6 --- src/modules/plasmalnf/CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt index 9e87b5fec..bd65db603 100644 --- a/src/modules/plasmalnf/CMakeLists.txt +++ b/src/modules/plasmalnf/CMakeLists.txt @@ -3,19 +3,20 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # +if(WITH_QT6) + calamares_skip_module( "plasmalnf (KDE Frameworks 5 only)" ) + return() +endif() + find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) # Requires a sufficiently recent Plasma framework, but also # needs a runtime support component (which we don't test for). -set(lnf_ver 5.41) -find_package(KF5Config ${lnf_ver}) +find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS Config Plasma Package) + set_package_properties(KF5Config PROPERTIES PURPOSE "For finding default Plasma Look-and-Feel") - -find_package(KF5Plasma ${lnf_ver}) set_package_properties(KF5Plasma PROPERTIES PURPOSE "For Plasma Look-and-Feel selection") - -find_package(KF5Package ${lnf_ver}) set_package_properties(KF5Package PROPERTIES PURPOSE "For Plasma Look-and-Feel selection") if(KF5Plasma_FOUND AND KF5Package_FOUND) @@ -35,8 +36,8 @@ if(KF5Plasma_FOUND AND KF5Package_FOUND) UI page_plasmalnf.ui LINK_PRIVATE_LIBRARIES - KF5::Package - KF5::Plasma + ${kfname}::Package + ${kfname}::Plasma SHARED_LIB ) if(KF5Config_FOUND)