kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Enable dbusmenu-qt with Qt 6

Browse source
This commit is contained in:
Ilya Fedin 2021-10-24 04:29:11 +04:00 • committed by John Preston
parent 57ccb6c03c
commit 50745176b1
3 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/CMakeLists.txt vendored
View file

@ -14,7 +14,7 @@ endmacro()
add_checked_subdirectory(angle) add_checked_subdirectory(angle)
add_checked_subdirectory(auto_updates) add_checked_subdirectory(auto_updates)
add_checked_subdirectory(crash_reports) add_checked_subdirectory(crash_reports)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION AND NOT DESKTOP_APP_QT6) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(dbusmenu_qt) add_checked_subdirectory(dbusmenu_qt)
endif() endif()
add_checked_subdirectory(expected) add_checked_subdirectory(expected)
@ -59,7 +59,7 @@ add_checked_subdirectory(qr_code_generator)
add_checked_subdirectory(ranges) add_checked_subdirectory(ranges)
add_checked_subdirectory(rlottie) add_checked_subdirectory(rlottie)
add_checked_subdirectory(rnnoise) add_checked_subdirectory(rnnoise)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION AND NOT DESKTOP_APP_QT6) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(statusnotifieritem) add_checked_subdirectory(statusnotifieritem)
endif() endif()
add_checked_subdirectory(ton) add_checked_subdirectory(ton)

20
external/dbusmenu_qt/CMakeLists.txt vendored
View file

@ -7,7 +7,7 @@
add_library(external_dbusmenu_qt INTERFACE IMPORTED GLOBAL) add_library(external_dbusmenu_qt INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt) add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt)
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_QT6)
if (DESKTOP_APP_USE_PACKAGED_LAZY) if (DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(dbusmenu-qt5 QUIET) find_package(dbusmenu-qt5 QUIET)
else() else()
@ -48,11 +48,19 @@ if (NOT dbusmenu-qt5_FOUND)
utils.cpp utils.cpp
) )
qt5_add_dbus_adaptor(dbusmenu_adaptor if (DESKTOP_APP_QT6)
${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml qt6_add_dbus_adaptor(dbusmenu_adaptor
${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
DBusMenuExporterDBus ${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_sources(external_dbusmenu_qt_bundled PRIVATE ${dbusmenu_adaptor})

18
external/statusnotifieritem/CMakeLists.txt vendored
View file

@ -18,11 +18,19 @@ PRIVATE
statusnotifieritem.h statusnotifieritem.h
) )
qt5_add_dbus_adaptor(sni_adaptor if (DESKTOP_APP_QT6)
${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml qt6_add_dbus_adaptor(sni_adaptor
${statusnotifieritem_loc}/statusnotifieritem.h ${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml
StatusNotifierItem ${statusnotifieritem_loc}/statusnotifieritem.h
) StatusNotifierItem
)
else()
qt5_add_dbus_adaptor(sni_adaptor
${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml
${statusnotifieritem_loc}/statusnotifieritem.h
StatusNotifierItem
)
endif()
set_target_properties(external_statusnotifieritem PROPERTIES AUTOMOC ON) set_target_properties(external_statusnotifieritem PROPERTIES AUTOMOC ON)