kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Add DESKTOP_APP_DISABLE_X11_INTEGRATION

Browse source
This commit is contained in:
Ilya Fedin 2021-02-22 17:27:39 +04:00 • committed by John Preston
parent 199bd8d0b2
commit ac193a597d
5 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/CMakeLists.txt vendored
View file

@ -19,8 +19,10 @@ endif()
add_checked_subdirectory(expected) add_checked_subdirectory(expected)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(fcitx_qt5) add_checked_subdirectory(fcitx_qt5)
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
add_checked_subdirectory(fcitx5_qt5) add_checked_subdirectory(fcitx5_qt5)
endif() endif()
endif()
add_checked_subdirectory(ffmpeg) add_checked_subdirectory(ffmpeg)
if (LINUX) if (LINUX)
add_checked_subdirectory(glib) add_checked_subdirectory(glib)
@ -61,7 +63,7 @@ endif()
add_checked_subdirectory(ton) add_checked_subdirectory(ton)
add_checked_subdirectory(variant) add_checked_subdirectory(variant)
add_checked_subdirectory(webrtc) add_checked_subdirectory(webrtc)
if (LINUX) if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
add_checked_subdirectory(xcb) add_checked_subdirectory(xcb)
endif() endif()
add_checked_subdirectory(xxhash) add_checked_subdirectory(xxhash)

8
external/qt/qt_static_plugins/CMakeLists.txt vendored
View file

@ -29,8 +29,14 @@ if (LINUX)
target_link_libraries(external_qt_static_plugins target_link_libraries(external_qt_static_plugins
PUBLIC PUBLIC
desktop-app::external_fcitx_qt5 desktop-app::external_fcitx_qt5
desktop-app::external_fcitx5_qt5
desktop-app::external_hime_qt desktop-app::external_hime_qt
) )
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
target_link_libraries(external_qt_static_plugins
PUBLIC
desktop-app::external_fcitx5_qt5
)
endif()
endif() endif()
endif() endif()

2
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -49,7 +49,9 @@ Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin)
Q_IMPORT_PLUGIN(NimfInputContextPlugin) Q_IMPORT_PLUGIN(NimfInputContextPlugin)
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin) Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY

7
options.cmake
View file

@ -27,6 +27,13 @@ if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
) )
endif() endif()
if (DESKTOP_APP_DISABLE_X11_INTEGRATION)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_DISABLE_X11_INTEGRATION
)
endif()
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(common_options target_compile_definitions(common_options
INTERFACE INTERFACE

1
variables.cmake
View file

@ -29,6 +29,7 @@ endif()
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_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF)
option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF)
option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF)
option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK 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)