From 654784ce9feef4dab412eb9357f06c728ec73ff5 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 4 Oct 2020 07:52:48 +0400 Subject: [PATCH] Use external_xcb and external_glib --- Telegram/CMakeLists.txt | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index f828f262e..7d896a91b 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -106,6 +106,9 @@ if (LINUX) desktop-app::external_materialdecoration desktop-app::external_nimf_qt5 desktop-app::external_qt5ct_support + desktop-app::external_xcb_screensaver + desktop-app::external_xcb + desktop-app::external_glib ) if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) @@ -137,35 +140,6 @@ if (LINUX) ) endif() - if (DESKTOP_APP_USE_PACKAGED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(XCB_SCREENSAVER REQUIRED IMPORTED_TARGET xcb-screensaver) - pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb) - - target_link_libraries(Telegram - PRIVATE - PkgConfig::XCB_SCREENSAVER - PkgConfig::XCB - ) - else() - target_link_static_libraries(Telegram PRIVATE xcb-screensaver) - target_link_libraries(Telegram PRIVATE xcb) - endif() - - find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) - pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0) - pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) - - target_link_libraries(Telegram - PRIVATE - PkgConfig::GLIB2 - PkgConfig::GOBJECT - PkgConfig::GIO - ) - - target_compile_definitions(Telegram PRIVATE G_LOG_DOMAIN="Telegram") - if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION) find_package(PkgConfig REQUIRED) @@ -1290,6 +1264,7 @@ target_compile_definitions(Telegram PRIVATE TDESKTOP_API_ID=${TDESKTOP_API_ID} TDESKTOP_API_HASH=${TDESKTOP_API_HASH} + G_LOG_DOMAIN="Telegram" ) if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")