Commit c9f7c43f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Simplify link lib

parent 14e97e4c
Pipeline #143548 failed with stage
in 3 minutes and 37 seconds
......@@ -438,11 +438,7 @@ target_link_libraries(kmailprivate
KF5::GuiAddons
${kmail_userfeedback_LIB}
)
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(kmailprivate PRIVATE qt6keychain)
else()
target_link_libraries(kmailprivate PRIVATE qt5keychain)
endif()
target_link_libraries(kmailprivate PRIVATE qt${QT_MAJOR_VERSION}keychain)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageList,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>)
......@@ -477,7 +473,7 @@ kcoreaddons_add_plugin(kcm_kmail_security SOURCES configuredialog/kcm_kmail_secu
target_link_libraries(kcm_kmail_security kcm_kmail_static)
########### kmailpart ###############
set(kmailpart_PART_SRCS kmail_part.cpp ${kmail_common_SRCS})
set(kmailpart_PART_SRCS kmail_part.cpp kmail_part.h ${kmail_common_SRCS})
qt_generate_dbus_interface(kmail_part.h org.kde.kmail.kmailpart.xml OPTIONS -a)
qt_add_dbus_adaptor(kmailpart_PART_SRCS
${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml kmail_part.h KMailPart
......
......@@ -10,8 +10,4 @@ target_link_libraries(sievedebugdialog
kmailprivate
)
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(sievedebugdialog qt6keychain)
else()
target_link_libraries(sievedebugdialog qt5keychain)
endif()
target_link_libraries(sievedebugdialog qt${QT_MAJOR_VERSION}keychain)
......@@ -9,8 +9,4 @@ target_link_libraries(sievemanagerdialog
kmailprivate
)
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(sievemanagerdialog qt6keychain)
else()
target_link_libraries(sievemanagerdialog qt5keychain)
endif()
target_link_libraries(sievemanagerdialog qt${QT_MAJOR_VERSION}keychain)
......@@ -4,8 +4,4 @@ add_executable(vacationmultiservertest main.cpp)
target_link_libraries(vacationmultiservertest KF5::KSieveUi KF5::KSieve KF5::I18n KF5::AkonadiCore kmailprivate)
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(vacationmultiservertest qt6keychain)
else()
target_link_libraries(vacationmultiservertest qt5keychain)
endif()
target_link_libraries(vacationmultiservertest qt${QT_MAJOR_VERSION}keychain)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment