mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Use external_xcb and external_glib
This commit is contained in:
parent
744eccc51e
commit
654784ce9f
1 changed files with 4 additions and 29 deletions
|
@ -106,6 +106,9 @@ if (LINUX)
|
||||||
desktop-app::external_materialdecoration
|
desktop-app::external_materialdecoration
|
||||||
desktop-app::external_nimf_qt5
|
desktop-app::external_nimf_qt5
|
||||||
desktop-app::external_qt5ct_support
|
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)
|
if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
|
||||||
|
@ -137,35 +140,6 @@ if (LINUX)
|
||||||
)
|
)
|
||||||
endif()
|
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)
|
if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
|
|
||||||
|
@ -1290,6 +1264,7 @@ target_compile_definitions(Telegram
|
||||||
PRIVATE
|
PRIVATE
|
||||||
TDESKTOP_API_ID=${TDESKTOP_API_ID}
|
TDESKTOP_API_ID=${TDESKTOP_API_ID}
|
||||||
TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
|
TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
|
||||||
|
G_LOG_DOMAIN="Telegram"
|
||||||
)
|
)
|
||||||
|
|
||||||
if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")
|
if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")
|
||||||
|
|
Loading…
Add table
Reference in a new issue