From 179796d598e459a65bb2f7deeb37456ce45e68a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 3 Sep 2023 14:22:11 +0200 Subject: [PATCH] CMake: can't mix KF5 and Qt6 This will fail to build because we require KDE Frameworks CoreAddons, but I don't have one just now. --- src/libcalamares/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 61971e6b2..bb16d356d 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -100,7 +100,10 @@ set_target_properties( SOVERSION ${CALAMARES_SOVERSION} 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) #