[plasmalnf] simplify KF5-finding
- No need to double-up package finding.
This commit is contained in:
parent
1cf3ac810a
commit
0c4d77541f
@ -21,14 +21,6 @@ set_package_properties(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if ( KF5Plasma_FOUND AND KF5Package_FOUND )
|
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
|
calamares_add_plugin( plasmalnf
|
||||||
TYPE viewmodule
|
TYPE viewmodule
|
||||||
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
||||||
@ -45,11 +37,13 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
|
|||||||
page_plasmalnf.ui
|
page_plasmalnf.ui
|
||||||
LINK_PRIVATE_LIBRARIES
|
LINK_PRIVATE_LIBRARIES
|
||||||
calamaresui
|
calamaresui
|
||||||
${option_libs}
|
|
||||||
KF5::Package
|
KF5::Package
|
||||||
KF5::Plasma
|
KF5::Plasma
|
||||||
SHARED_LIB
|
SHARED_LIB
|
||||||
)
|
)
|
||||||
|
if ( KF5Config_FOUND )
|
||||||
|
target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
calamares_skip_module( "plasmalnf (missing requirements)" )
|
calamares_skip_module( "plasmalnf (missing requirements)" )
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user