From a428df5440e76a726abc30924766ac7da0cb381c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 21 Apr 2024 01:00:14 +0400 Subject: [PATCH] Remove direct Wayland usage --- external/CMakeLists.txt | 3 --- external/qt/package.cmake | 11 ----------- external/wayland_client/CMakeLists.txt | 16 ---------------- 3 files changed, 30 deletions(-) delete mode 100644 external/wayland_client/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d9af92a..a8406e1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -60,9 +60,6 @@ add_checked_subdirectory(rnnoise) add_checked_subdirectory(ton) add_checked_subdirectory(variant) add_checked_subdirectory(vpx) -if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) - add_checked_subdirectory(wayland_client) -endif() add_checked_subdirectory(webrtc) if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) add_checked_subdirectory(xcb) diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 03f5732..2acdade 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -39,23 +39,12 @@ endif() find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED) find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Quick QuickWidgets QUIET) -set(qt_version_6_5_or_greater 0) if (QT_VERSION_MAJOR GREATER_EQUAL 6) - if (QT_VERSION_MAJOR GREATER 6 OR Qt6_VERSION_MINOR GREATER_EQUAL 5) - set(qt_version_6_5_or_greater 1) - endif() find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED) endif() -# QtWaylandScanner cmake integration from Qt 6 is used -cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_5_or_greater" ON) - if (LINUX) find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DBus WaylandClient WaylandCompositor QUIET) - - if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WaylandClient REQUIRED) - endif() endif() set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP "(gen)") diff --git a/external/wayland_client/CMakeLists.txt b/external/wayland_client/CMakeLists.txt deleted file mode 100644 index e310fae..0000000 --- a/external/wayland_client/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -add_library(external_wayland_client INTERFACE IMPORTED GLOBAL) -add_library(desktop-app::external_wayland_client ALIAS external_wayland_client) - -if (DESKTOP_APP_USE_PACKAGED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client) - target_link_libraries(external_wayland_client INTERFACE PkgConfig::WAYLAND_CLIENT) -else() - target_link_optional_libraries(external_wayland_client INTERFACE wayland-client) -endif()