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

CMake: can't mix KF5 and Qt6

Browse Source 
This will fail to build because we require KDE Frameworks
CoreAddons, but I don't have one just now.
This commit is contained in:
Adriaan de Groot 2023-09-03 14:22:11 +02:00
parent 2b40ab9a5b
commit 179796d598
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamares/CMakeLists.txt
View File

@ -100,7 +100,10 @@ set_target_properties(
SOVERSION ${CALAMARES_SOVERSION} SOVERSION ${CALAMARES_SOVERSION}
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
) )
target_link_libraries(calamares LINK_PUBLIC yamlcpp::yamlcpp ${qtname}::Core KF5::CoreAddons) target_link_libraries(calamares LINK_PUBLIC yamlcpp::yamlcpp ${qtname}::Core)
if(NOT WITH_QT6) # TODO: Qt6
target_link_libraries(calamares LINK_PUBLIC KF5::CoreAddons)
endif()
### OPTIONAL Automount support (requires dbus) ### OPTIONAL Automount support (requires dbus)
# #