Commit 49e0e1b8 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 1d41c965
Pipeline #121302 passed with stage
in 1 minute and 44 seconds
......@@ -95,7 +95,7 @@ else()
set(_kleopatra_dbusaddons_libs KF5::DBusAddons)
endif()
set(HAVE_QDBUS ${Qt5DBus_FOUND})
set(HAVE_QDBUS ${Qt${QT_MAJOR_VERSION}DBus_FOUND})
find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
if (Gpgmepp_VERSION VERSION_GREATER_EQUAL "1.16.0")
......@@ -119,7 +119,7 @@ endif()
find_package(KF5Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_WANT_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)
find_package(Assuan2 REQUIRED)
......
......@@ -9,4 +9,4 @@ ecm_qt_declare_logging_category(kuniqueservicetest_src HEADER kleopatra_debug.h
add_executable(kuniqueservicetest ${kuniqueservicetest_src})
add_test(NAME kuniqueservicetest COMMAND kuniqueservicetest)
ecm_mark_as_test(kuniqueservicetest)
target_link_libraries(kuniqueservicetest Qt::Test ${_kleopatra_dbusaddons_libs})
target_link_libraries(kuniqueservicetest Qt${QT_MAJOR_VERSION}::Test ${_kleopatra_dbusaddons_libs})
......@@ -365,8 +365,8 @@ target_link_libraries(kleopatra_bin
KF5::CoreAddons
KF5::ItemModels
KF5::Crash
Qt::Network
Qt::PrintSupport # Printing secret keys
Qt${QT_MAJOR_VERSION}::Network
Qt${QT_MAJOR_VERSION}::PrintSupport # Printing secret keys
${_kleopatra_uiserver_extra_libs}
${_kleopatra_dbusaddons_libs}
kleopatraclientcore
......
......@@ -66,6 +66,6 @@ else()
endif()
endif()
target_link_libraries(kleopatraclientcore Qt::Widgets KF5::I18n Gpgmepp)
target_link_libraries(kleopatraclientcore Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n Gpgmepp)
install(TARGETS kleopatraclientcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -13,7 +13,7 @@ foreach(_kleoclient_test ${kleoclient_TESTS})
target_link_libraries("${_kleoclient_test}"
kleopatraclientcore
Qt::Gui
Qt::Core
Qt${QT_MAJOR_VERSION}::Gui
Qt${QT_MAJOR_VERSION}::Core
)
endforeach()
......@@ -24,11 +24,11 @@ ecm_mark_as_test(test_verify)
target_link_libraries(test_verify
KF5::Libkleo
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
QGpgme
KF5::CoreAddons
KF5::I18n
Qt::Widgets
Qt${QT_MAJOR_VERSION}::Widgets
)
########### next target ###############
......
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