From 0c4d77541f827b188c3994e7760ee465d6f71202 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 May 2019 12:59:28 +0200 Subject: [PATCH] [plasmalnf] simplify KF5-finding - No need to double-up package finding. --- src/modules/plasmalnf/CMakeLists.txt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt index e39b1af9f..93c88b291 100644 --- a/src/modules/plasmalnf/CMakeLists.txt +++ b/src/modules/plasmalnf/CMakeLists.txt @@ -21,14 +21,6 @@ set_package_properties( ) if ( KF5Plasma_FOUND AND KF5Package_FOUND ) - if ( KF5Config_FOUND ) - set( option_kf5 Config ) - set( option_defs WITH_KCONFIG ) - # set( option_libs KF5::Config ) # Not needed anyway - endif() - - find_package( KF5 ${lnf_ver} REQUIRED CoreAddons Plasma Package ${option_kf5} ) - calamares_add_plugin( plasmalnf TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO @@ -45,11 +37,13 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND ) page_plasmalnf.ui LINK_PRIVATE_LIBRARIES calamaresui - ${option_libs} KF5::Package KF5::Plasma SHARED_LIB ) + if ( KF5Config_FOUND ) + target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG) + endif() else() calamares_skip_module( "plasmalnf (missing requirements)" ) endif()