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

Adapt build system for building against qt6

parent c21cc6b6
Pipeline #167233 passed with stage
in 52 seconds
......@@ -40,7 +40,7 @@ include(ECMInstallIcons)
include(ECMQtDeclareLoggingCategory)
include(GenerateExportHeader)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
Core
DBus
Gui
......@@ -195,8 +195,8 @@ target_link_libraries(kmixcore
Qt::Core
Qt::Widgets
PRIVATE
Qt5::Xml
Qt5::DBus
Qt::Xml
Qt::DBus
KF5::I18n
KF5::Solid
PUBLIC
......@@ -345,14 +345,14 @@ target_link_libraries(kmixctrl
install(TARGETS kmixctrl ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES desktop/kmixctrl_restore.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(FILES desktop/kmixctrl_restore.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
####################################################################################################
########### tests ##################################################################################
####################################################################################################
if(BUILD_TESTING)
find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
add_subdirectory(tests)
endif()
......
......@@ -5,15 +5,15 @@ set(mixer_engine_SRCS
mixerservice.cpp
)
qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixset.xml
qt_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixset.xml
mixset_interface)
qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixer.xml
qt_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixer.xml
mixer_interface)
qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml
qt_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml
control_interface)
add_library(plasma_engine_mixer MODULE ${mixer_engine_SRCS})
target_link_libraries(plasma_engine_mixer KF5::Plasma Qt5::DBus)
target_link_libraries(plasma_engine_mixer KF5::Plasma Qt::DBus)
kcoreaddons_desktop_to_json(plasma_engine_mixer plasma-dataengine-mixer.desktop)
install(TARGETS plasma_engine_mixer DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
......
......@@ -5,9 +5,9 @@ add_executable(profiletest ${profiletest_SRCS})
target_link_libraries(profiletest
kmixgui
Qt5::Core
Qt5::DBus
Qt5::Test
Qt::Core
Qt::DBus
Qt::Test
KF5::ConfigCore
KF5::ConfigGui
KF5::I18n
......
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