kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Move TDESKTOP_DISABLE_DBUS_INTEGRATION to cmake_helpers

Browse source
This commit is contained in:
Ilya Fedin 2020-02-16 13:26:34 +04:00 • committed by John Preston
parent 395c12deb1
commit 99278254e3
5 changed files with 16 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

@ -6,7 +6,7 @@
add_subdirectory(auto_updates) add_subdirectory(auto_updates)
add_subdirectory(crash_reports) add_subdirectory(crash_reports)
if (LINUX) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_subdirectory(dbusmenu_qt) add_subdirectory(dbusmenu_qt)
endif() endif()
add_subdirectory(expected) add_subdirectory(expected)
@ -24,7 +24,7 @@ add_subdirectory(rlottie)
if (APPLE) if (APPLE)
add_subdirectory(sp_media_key_tap) add_subdirectory(sp_media_key_tap)
endif() endif()
if (LINUX) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_subdirectory(statusnotifieritem) add_subdirectory(statusnotifieritem)
endif() endif()
add_subdirectory(variant) add_subdirectory(variant)

7
external/dbusmenu_qt/CMakeLists.txt vendored
View file

@ -8,11 +8,8 @@ if (DESKTOP_APP_USE_PACKAGED)
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)
find_package(dbusmenu-qt5) find_package(dbusmenu-qt5 REQUIRED)
target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5)
if (dbusmenu-qt5_FOUND)
target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5)
endif()
else() else()
add_library(external_dbusmenu_qt OBJECT) add_library(external_dbusmenu_qt OBJECT)
add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt) add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt)

11
external/qt/CMakeLists.txt vendored
View file

@ -141,8 +141,13 @@ else()
cups cups
) )
else() else()
set(qt_libs_dbus)
set(qt_libs_dbus_support)
set(qt_libs_dbus_plugins)
set(qt_libs_dbus_bearers)
if (Qt5DBus_FOUND) if (Qt5DBus_FOUND)
set(qt_libs_dbus lib/${qt_lib_prefix}Qt5DBus) set(qt_libs_dbus lib/${qt_lib_prefix}Qt5DBus)
set(qt_libs_dbus_support lib/${qt_lib_prefix}Qt5LinuxAccessibilitySupport)
set(qt_libs_dbus_plugins set(qt_libs_dbus_plugins
plugins/platforminputcontexts/${qt_lib_prefix}ibusplatforminputcontextplugin plugins/platforminputcontexts/${qt_lib_prefix}ibusplatforminputcontextplugin
plugins/platforminputcontexts/${qt_lib_prefix}fcitxplatforminputcontextplugin plugins/platforminputcontexts/${qt_lib_prefix}fcitxplatforminputcontextplugin
@ -161,9 +166,9 @@ else()
plugins/platforms/${qt_lib_prefix}qxcb plugins/platforms/${qt_lib_prefix}qxcb
plugins/iconengines/${qt_lib_prefix}qsvgicon plugins/iconengines/${qt_lib_prefix}qsvgicon
lib/${qt_lib_prefix}Qt5XcbQpa lib/${qt_lib_prefix}Qt5XcbQpa
lib/${qt_lib_prefix}Qt5LinuxAccessibilitySupport
lib/${qt_lib_prefix}Qt5ServiceSupport lib/${qt_lib_prefix}Qt5ServiceSupport
lib/${qt_lib_prefix}Qt5EdidSupport lib/${qt_lib_prefix}Qt5EdidSupport
${qt_libs_dbus_support}
plugins/bearer/${qt_lib_prefix}qgenericbearer plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers} ${qt_libs_dbus_bearers}
${common_qt_libs} ${common_qt_libs}
@ -247,9 +252,5 @@ else()
glib-2.0 glib-2.0
pthread pthread
) )
find_library(DBUS_LIBRARY dbus-1)
if (Qt5DBus_FOUND AND DBUS_LIBRARY)
target_link_libraries(external_qt INTERFACE dbus-1)
endif()
endif() endif()
endif() endif()

6
external/qt/package.cmake vendored
View file

@ -27,7 +27,11 @@ if (LINUX)
find_package(Qt5 COMPONENTS Svg REQUIRED) find_package(Qt5 COMPONENTS Svg REQUIRED)
endif() endif()
find_package(Qt5 COMPONENTS DBus) if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
find_package(Qt5 COMPONENTS DBus)
else()
find_package(Qt5 COMPONENTS DBus REQUIRED)
endif()
endif() endif()
set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP "(gen)") set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP "(gen)")

1
variables.cmake
View file

@ -5,6 +5,7 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON)
option(DESKTOP_APP_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF)
option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF)
if (LINUX AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") if (LINUX AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")