RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-10 00:57:57 +00:00
Code Issues Projects Releases Wiki Activity

Use namespaced library aliases.

Browse Source
This commit is contained in:
John Preston 2019-11-21 17:41:11 +03:00
parent 9e5262008f
commit 11b02b4f88
17 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Telegram/CMakeLists.txt
View File

@ -18,7 +18,6 @@ add_subdirectory(lib_tl)
add_subdirectory(lib_spellcheck)
add_subdirectory(lib_storage)
add_subdirectory(lib_lottie)
add_subdirectory(lib_rlottie)
add_subdirectory(codegen)
include(lib_ui/cmake/generate_styles.cmake)
@ -69,26 +68,26 @@ set_target_properties(Telegram PROPERTIES AUTORCC ON)
target_link_libraries(Telegram
PRIVATE
lib_base
lib_crl
lib_ui
lib_tl
lib_storage
lib_lottie
lib_rlottie
lib_mtproto
lib_scheme
lib_export
lib_ffmpeg
lib_tgvoip
external_lz4
external_qt
external_openssl
external_crash_reports
external_auto_updates
external_zlib
external_opus
external_openal
tdesktop::lib_mtproto
tdesktop::lib_scheme
tdesktop::lib_export
tdesktop::lib_tgvoip
desktop-app::lib_base
desktop-app::lib_crl
desktop-app::lib_ui
desktop-app::lib_tl
desktop-app::lib_storage
desktop-app::lib_lottie
desktop-app::lib_ffmpeg
desktop-app::external_lz4
desktop-app::external_rlottie
desktop-app::external_qt
desktop-app::external_openssl
desktop-app::external_crash_reports
desktop-app::external_auto_updates
desktop-app::external_zlib
desktop-app::external_opus
desktop-app::external_openal
)
set(telegram_sources
@ -964,12 +963,12 @@ if (WIN32)
else()
target_link_libraries(Telegram
PRIVATE
external_minizip
desktop-app::external_minizip
)
if (APPLE)
target_link_libraries(Telegram
PRIVATE
external_sp_media_key_tap
desktop-app::external_sp_media_key_tap
)
endif()
endif()

5
Telegram/cmake/lib_export.cmake
View File

@ -6,6 +6,7 @@
add_library(lib_export OBJECT)
init_target(lib_export)
add_library(tdesktop::lib_export ALIAS lib_export)
set(lib_export_sources
PRIVATE
@ -42,6 +43,6 @@ PUBLIC
target_link_libraries(lib_export
PUBLIC
lib_base
lib_scheme
desktop-app::lib_base
tdesktop::lib_scheme
)

3
Telegram/cmake/lib_ffmpeg.cmake
View File

@ -5,6 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
add_library(lib_ffmpeg OBJECT)
add_library(desktop-app::lib_ffmpeg ALIAS lib_ffmpeg)
init_target(lib_ffmpeg)
set(lib_ffmpeg_sources
@ -27,7 +28,7 @@ PUBLIC
target_link_libraries(lib_ffmpeg
PUBLIC
lib_base
desktop-app::lib_base
${libs_loc}/ffmpeg/libavformat/libavformat.a
${libs_loc}/ffmpeg/libavcodec/libavcodec.a
${libs_loc}/ffmpeg/libavutil/libavutil.a

3
Telegram/cmake/lib_mtproto.cmake
View File

@ -6,6 +6,7 @@
add_library(lib_mtproto OBJECT)
init_target(lib_mtproto)
add_library(tdesktop::lib_mtproto ALIAS lib_mtproto)
set(lib_mtproto_sources
PRIVATE
@ -27,5 +28,5 @@ PUBLIC
target_link_libraries(lib_mtproto
PUBLIC
lib_scheme
tdesktop::lib_scheme
)

5
Telegram/cmake/lib_scheme.cmake
View File

@ -6,6 +6,7 @@
add_library(lib_scheme OBJECT)
init_target(lib_scheme)
add_library(tdesktop::lib_scheme ALIAS lib_scheme)
include(cmake/generate_scheme.cmake)
@ -23,6 +24,6 @@ PUBLIC
target_link_libraries(lib_scheme
PUBLIC
lib_base
lib_tl
desktop-app::lib_base
desktop-app::lib_tl
)

3
Telegram/cmake/lib_tgvoip.cmake
View File

@ -6,6 +6,7 @@
add_library(lib_tgvoip OBJECT)
init_target(lib_tgvoip)
add_library(tdesktop::lib_tgvoip ALIAS lib_tgvoip)
set(tgvoip_loc ${third_party_loc}/libtgvoip)
@ -761,5 +762,5 @@ PRIVATE
target_link_libraries(lib_tgvoip
PRIVATE
external_openssl
desktop-app::external_openssl
)

2
Telegram/cmake/telegram_options.cmake
View File

@ -48,7 +48,7 @@ endif()
if (DESKTOP_APP_DISABLE_SPELLCHECK)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK)
else()
target_link_libraries(Telegram PRIVATE lib_spellcheck)
target_link_libraries(Telegram PRIVATE desktop-app::lib_spellcheck)
endif()
if (TDESKTOP_FORCE_GTK_FILE_DIALOG)

2
Telegram/codegen

@ -1 +1 @@
Subproject commit dc530a1cecddf8291b7b67e71e455cef6b963e06
Subproject commit 69190a33751b25dba7681e44656e608a575bbfb3

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit c156e8eaf7600545024625ce182995e9305ef6ff
Subproject commit 10b9bdc0374e5259b3211ac2d684118e6f6685a3

2
Telegram/lib_crl

@ -1 +1 @@
Subproject commit 48bfce822d5a3262e9b0643517a2a996125e1026
Subproject commit 0d9e70330ac10891afd6775e52968805bd83b8a4

2
Telegram/lib_lottie

@ -1 +1 @@
Subproject commit 03693ebccbc41af6279e3fcdb1e91ea23f9942b4
Subproject commit 38bca2d3f2bbf7c4a3c39f744490eb9fb869138c

2
Telegram/lib_rpl

@ -1 +1 @@
Subproject commit 2423c263604441616fbe402bafa07101bb2dc29d
Subproject commit 370de851feff5612954189deb16a2154d6d1ef2d

2
Telegram/lib_spellcheck

@ -1 +1 @@
Subproject commit e4ac966708205159a696435021a7c1a6ccd71dae
Subproject commit 62e220b9f142b64071fd21d64bdbccf665acc2fd

2
Telegram/lib_storage

@ -1 +1 @@
Subproject commit 1ed6307b816d368c20848e653e47498292c607c4
Subproject commit aee02d865b67cfc2215d2e3f7e21be9e1f723376

2
Telegram/lib_tl

@ -1 +1 @@
Subproject commit 54f5073dc49b518f75e57352fde5df47973791d5
Subproject commit 5e1b052bf788e50671be38b46a6818e14cf92e24

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit b7af3b71a3f7ee93cb2ea70cdeb16a8a3ff06bce
Subproject commit 8e3034213761ba98a916b16ad230560e5695c856

2
cmake

@ -1 +1 @@
Subproject commit 118ce81dd412306900f862be412b419cf243cfa2
Subproject commit 33612794c6343b95835aa66d07dd10af99a873de