Commit 89edcbe4 authored by Laurent Montel's avatar Laurent Montel
Browse files

Adapt build system for building against qt6

Still QDBusPlatformMenu linking problem (not idea yet)
parent 8a36a5b4
Pipeline #159437 passed with stage
in 1 minute and 7 seconds
......@@ -30,7 +30,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
WidgetsAddons WindowSystem ConfigWidgets
)
find_package(QtWaylandScanner REQUIRED)
if (QT_MAJOR_VERSION EQUAL "5")
find_package(QtWaylandScanner ${QT_MIN_VERSION} REQUIRED)
endif()
find_package(Wayland 1.9 REQUIRED Client)
find_package(PlasmaWaylandProtocols 1.6.0 CONFIG REQUIRED)
......
......@@ -37,18 +37,24 @@ set(platformtheme_SRCS
qt_add_dbus_interface(platformtheme_SRCS org.kde.StatusNotifierWatcher.xml statusnotifierwatcher_interface)
kconfig_add_kcfg_files(platformtheme_SRCS renderersettings.kcfgc)
add_library(KDEPlasmaPlatformTheme MODULE)
if (QT_MAJOR_VERSION EQUAL "5")
ecm_add_qtwayland_client_protocol(platformtheme_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml
BASENAME appmenu
)
ecm_add_qtwayland_client_protocol(platformtheme_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml
BASENAME appmenu
)
ecm_add_qtwayland_client_protocol(platformtheme_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml
BASENAME server-decoration-palette
)
add_library(KDEPlasmaPlatformTheme MODULE ${platformtheme_SRCS})
ecm_add_qtwayland_client_protocol(platformtheme_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml
BASENAME server-decoration-palette
)
else()
qt6_generate_wayland_protocol_client_sources(KDEPlasmaPlatformTheme FILES
${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml
${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml
)
endif()
target_sources(KDEPlasmaPlatformTheme PRIVATE ${platformtheme_SRCS})
target_link_libraries(KDEPlasmaPlatformTheme
PRIVATE
......
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