Commit 9f79985b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system to qt6 support

parent c82845cc
Pipeline #157102 passed with stage
in 1 minute and 4 seconds
......@@ -32,17 +32,17 @@ set(ACCOUNTSQT_DEP_VERSION "1.13")
set(SIGNONQT_DEP_VERSION "8.55")
set(ACCOUNTSGLIB_DEP_VERSION "1.21")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Widgets)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KCMUtils I18n CoreAddons DBusAddons Declarative Wallet KIO)
find_package(AccountsQt5 ${ACCOUNTSQT_DEP_VERSION} CONFIG)
set_package_properties(AccountsQt5 PROPERTIES DESCRIPTION "Accounts management library for Qt applications"
find_package(AccountsQt${QT_MAJOR_VERSION} ${ACCOUNTSQT_DEP_VERSION} CONFIG)
set_package_properties(AccountsQt${QT_MAJOR_VERSION} PROPERTIES DESCRIPTION "Accounts management library for Qt applications"
URL "https://gitlab.com/accounts-sso/libaccounts-qt"
TYPE REQUIRED
PURPOSE "Required for building this module")
find_package(SignOnQt5 ${SIGNONQT_DEP_VERSION} CONFIG)
set_package_properties(SignOnQt5 PROPERTIES DESCRIPTION "D-Bus service which performs user authentication on behalf of its clients"
find_package(SignOnQt${QT_MAJOR_VERSION} ${SIGNONQT_DEP_VERSION} CONFIG)
set_package_properties(SignOnQt${QT_MAJOR_VERSION} PROPERTIES DESCRIPTION "D-Bus service which performs user authentication on behalf of its clients"
URL "https://gitlab.com/accounts-sso/signond"
TYPE REQUIRED
PURPOSE "Required for building this module")
......
......@@ -2,7 +2,7 @@ ecm_add_qml_module(kaccountsdeclarativeplugin URI "org.kde.kaccounts" VERSION 1.
target_sources(kaccountsdeclarativeplugin PRIVATE kaccountsdeclarativeplugin.cpp kaccountsdeclarativeplugin.h)
target_link_libraries(kaccountsdeclarativeplugin Qt5::Qml
target_link_libraries(kaccountsdeclarativeplugin Qt::Qml
KF5::I18n
kaccounts
)
......
add_library(kcm_kaccounts MODULE accounts.cpp accounts.h)
target_link_libraries(kcm_kaccounts
Qt5::Core
Qt::Core
KF5::CoreAddons
KF5::I18n
KF5::QuickAddons
......
......@@ -5,7 +5,7 @@ kcoreaddons_add_plugin(
)
target_link_libraries(kded_accounts
Qt5::Core
Qt::Core
KF5::DBusAddons
kaccounts
)
......@@ -67,8 +67,8 @@ target_link_libraries (kaccounts
KF5::CoreAddons
KF5::I18n
${ACCOUNTSQT_LIBRARIES}
Qt5::Xml
Qt5::Gui
Qt::Xml
Qt::Gui
PRIVATE
${SIGNONQT_LIBRARIES}
)
......
......@@ -17,8 +17,8 @@ kcoreaddons_add_plugin(kaccounts_kio_webdav_plugin
)
target_link_libraries(kaccounts_kio_webdav_plugin
Qt5::Core
Qt5::Widgets
Qt::Core
Qt::Widgets
KF5::CoreAddons
KF5::ConfigCore
KF5::Wallet
......
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