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

Merge pull request #2240 from demmm/calamares

Browse Source 
[CMake] use KPMCore version to select Qt6
This commit is contained in:
Adriaan de Groot 2023-11-19 20:57:45 +01:00 committed by GitHub
commit 65f93168f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeModules/KPMcoreHelper.cmake
View File

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

1
src/modules/summaryq/CMakeLists.txt
View File

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