kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Get rid of GTK integration

Browse source
This commit is contained in:
Ilya Fedin 2021-09-03 20:18:05 +04:00 • committed by John Preston
parent 995b1e4cbd
commit 95ee188c7b
5 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -10,9 +10,7 @@ if (LINUX
AND Qt5WaylandClient_FOUND) AND Qt5WaylandClient_FOUND)
add_subdirectory(linux_wayland_helper) add_subdirectory(linux_wayland_helper)
endif() endif()
if (LINUX if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
AND NOT DESKTOP_APP_USE_PACKAGED
AND NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
add_subdirectory(linux_gtk_helper) add_subdirectory(linux_gtk_helper)
endif() endif()
if (DESKTOP_APP_USE_ALLOCATION_TRACER) if (DESKTOP_APP_USE_ALLOCATION_TRACER)

20
external/qt/CMakeLists.txt vendored
View file

@ -212,17 +212,11 @@ else()
plugins/wayland-decoration-client/${qt_lib_prefix}bradient plugins/wayland-decoration-client/${qt_lib_prefix}bradient
) )
endif() endif()
set(qt_libs_gtk_plugins)
if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
set(qt_libs_gtk_plugins
plugins/platformthemes/${qt_lib_prefix}qgtk3
)
endif()
set(qt_libs set(qt_libs
plugins/platforminputcontexts/${qt_lib_prefix}composeplatforminputcontextplugin plugins/platforminputcontexts/${qt_lib_prefix}composeplatforminputcontextplugin
${qt_libs_dbus_plugins} ${qt_libs_dbus_plugins}
${qt_libs_waylandclient_plugins} ${qt_libs_waylandclient_plugins}
${qt_libs_gtk_plugins} plugins/platformthemes/${qt_lib_prefix}qgtk3
plugins/platforms/${qt_lib_prefix}qxcb plugins/platforms/${qt_lib_prefix}qxcb
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration
@ -290,13 +284,11 @@ else()
$<TARGET_FILE:desktop-app::linux_wayland_helper> $<TARGET_FILE:desktop-app::linux_wayland_helper>
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) target_link_libraries(external_qt
target_link_libraries(external_qt INTERFACE
INTERFACE desktop-app::linux_gtk_helper
desktop-app::linux_gtk_helper $<TARGET_FILE:desktop-app::linux_gtk_helper>
$<TARGET_FILE:desktop-app::linux_gtk_helper> )
)
endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
fontconfig fontconfig

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

@ -39,9 +39,7 @@ Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin) Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin) Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION #endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
Q_IMPORT_PLUGIN(QGtk3ThemePlugin) Q_IMPORT_PLUGIN(QGtk3ThemePlugin)
#endif // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
#endif // !DESKTOP_APP_USE_PACKAGED #endif // !DESKTOP_APP_USE_PACKAGED

7
options.cmake
View file

@ -42,13 +42,6 @@ if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
) )
endif() endif()
if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_DISABLE_GTK_INTEGRATION
)
endif()
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
target_compile_definitions(common_options target_compile_definitions(common_options
INTERFACE INTERFACE

1
variables.cmake
View file

@ -21,7 +21,6 @@ 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_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_USE_ALLOCATION_TRACER "Use simple allocation tracer (Linux only)." OFF) option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer (Linux only)." OFF)
option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target})
option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)