From 3bfed84c45042cffbc3175f6d72c93292f6aa771 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 8 Jun 2023 19:17:22 +0200 Subject: [PATCH] Now we depend against qt6 --- src/CMakeLists.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7531ce2..0b9877c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,15 +4,10 @@ remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) add_library(LayerShellQtInterface) -if (QT_MAJOR_VERSION EQUAL "5") - ecm_add_qtwayland_client_protocol(LAYER_SHELL_SOURCES PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml BASENAME xdg-shell) - ecm_add_qtwayland_client_protocol(LAYER_SHELL_SOURCES PROTOCOL wlr-layer-shell-unstable-v1.xml BASENAME wlr-layer-shell-unstable-v1) -else() - qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES - ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml - ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml - ) -endif() +qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES + ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml + ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml +) ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES HEADER