[CMake] use KPMCore version to select Qt6

with 2588d1e796
KPMCore is Qt6 only, so any version from 24.01.75 on is Qt6, no need to check for Qt version this way
add missing NO_CONFIG to summaryq
This commit is contained in:
demmm 2023-11-19 15:40:29 +01:00
parent 5f06b321b2
commit 0e2fa42b60
2 changed files with 12 additions and 10 deletions

View File

@ -15,9 +15,11 @@ if(NOT TARGET calapmcore)
find_package(${kfname}I18n CONFIG)
find_package(${kfname}WidgetsAddons CONFIG)
if(NOT WITH_QT6)
# TODO: Qt6 how to detect the version of Qt that KPMCore needs?
if( WITH_QT6)
find_package(KPMcore 24.01.75)
else()
find_package(KPMcore 20.04.0)
endif()
set_package_properties(
KPMcore
PROPERTIES
@ -26,7 +28,6 @@ if(NOT TARGET calapmcore)
TYPE RECOMMENDED
PURPOSE "For disk partitioning support"
)
endif()
# Create an internal Calamares interface to KPMcore
# and give it a nice alias name. If kpmcore is not found,

View File

@ -23,4 +23,5 @@ calamares_add_plugin(summaryq
LINK_PRIVATE_LIBRARIES
calamaresui
SHARED_LIB
NO_CONFIG
)