From 8e0b71c04968143c2178534a448035f86dc6d01e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 22 Jan 2022 00:13:58 +0400 Subject: [PATCH] Remove external_dbusmenu_qt --- external/CMakeLists.txt | 3 -- external/dbusmenu_qt/CMakeLists.txt | 81 ----------------------------- 2 files changed, 84 deletions(-) delete mode 100644 external/dbusmenu_qt/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8c8e4c7..0922a66 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -14,9 +14,6 @@ endmacro() add_checked_subdirectory(angle) add_checked_subdirectory(auto_updates) add_checked_subdirectory(crash_reports) -if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - add_checked_subdirectory(dbusmenu_qt) -endif() if (LINUX) add_checked_subdirectory(dispatch) endif() diff --git a/external/dbusmenu_qt/CMakeLists.txt b/external/dbusmenu_qt/CMakeLists.txt deleted file mode 100644 index 3539612..0000000 --- a/external/dbusmenu_qt/CMakeLists.txt +++ /dev/null @@ -1,81 +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_dbusmenu_qt INTERFACE IMPORTED GLOBAL) -add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt) - -if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_QT6) - if (DESKTOP_APP_USE_PACKAGED_LAZY) - find_package(dbusmenu-qt5 QUIET) - else() - find_package(dbusmenu-qt5) - endif() - - if (dbusmenu-qt5_FOUND) - target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5) - return() - endif() -endif() - -add_library(external_dbusmenu_qt_bundled STATIC) -init_target(external_dbusmenu_qt_bundled "(external)") - -set(dbusmenu_qt_VERSION_MAJOR 0) -set(dbusmenu_qt_VERSION_MINOR 9) -set(dbusmenu_qt_VERSION_PATCH 2) - -set(dbusmenu_qt_loc ${third_party_loc}/libdbusmenu-qt/src) - -set_target_properties(external_dbusmenu_qt_bundled PROPERTIES AUTOMOC ON) - -# QIcon::name was introduced in Qt 4.7. -set(HAVE_QICON_NAME ON) - -configure_file(${dbusmenu_qt_loc}/dbusmenu_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_config.h" @ONLY) -configure_file(${dbusmenu_qt_loc}/dbusmenu_version.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h") - -nice_target_sources(external_dbusmenu_qt_bundled ${dbusmenu_qt_loc} -PRIVATE - dbusmenu_p.cpp - dbusmenuexporter.cpp - dbusmenuexporterdbus_p.cpp - dbusmenuimporter.cpp - dbusmenutypes_p.cpp - dbusmenushortcut_p.cpp - utils.cpp -) - -if (DESKTOP_APP_QT6) - qt6_add_dbus_adaptor(dbusmenu_adaptor - ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml - ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h - DBusMenuExporterDBus - ) -else() - qt5_add_dbus_adaptor(dbusmenu_adaptor - ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml - ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h - DBusMenuExporterDBus - ) -endif() - -target_sources(external_dbusmenu_qt_bundled PRIVATE ${dbusmenu_adaptor}) - -target_include_directories(external_dbusmenu_qt_bundled -PUBLIC - ${dbusmenu_qt_loc} - "${CMAKE_CURRENT_BINARY_DIR}" -) - -target_link_libraries(external_dbusmenu_qt_bundled -PRIVATE - desktop-app::external_qt -) - -target_link_libraries(external_dbusmenu_qt -INTERFACE - external_dbusmenu_qt_bundled -)