From 11b02b4f88328baed7bdb217ec9b411df8c284e9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 21 Nov 2019 17:41:11 +0300 Subject: [PATCH] Use namespaced library aliases. --- Telegram/CMakeLists.txt | 45 +++++++++++++-------------- Telegram/cmake/lib_export.cmake | 5 +-- Telegram/cmake/lib_ffmpeg.cmake | 3 +- Telegram/cmake/lib_mtproto.cmake | 3 +- Telegram/cmake/lib_scheme.cmake | 5 +-- Telegram/cmake/lib_tgvoip.cmake | 3 +- Telegram/cmake/telegram_options.cmake | 2 +- Telegram/codegen | 2 +- Telegram/lib_base | 2 +- Telegram/lib_crl | 2 +- Telegram/lib_lottie | 2 +- Telegram/lib_rpl | 2 +- Telegram/lib_spellcheck | 2 +- Telegram/lib_storage | 2 +- Telegram/lib_tl | 2 +- Telegram/lib_ui | 2 +- cmake | 2 +- 17 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 2dc4bf7225..a7b91bed73 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -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() diff --git a/Telegram/cmake/lib_export.cmake b/Telegram/cmake/lib_export.cmake index 11570a20a9..1903d20456 100644 --- a/Telegram/cmake/lib_export.cmake +++ b/Telegram/cmake/lib_export.cmake @@ -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 ) diff --git a/Telegram/cmake/lib_ffmpeg.cmake b/Telegram/cmake/lib_ffmpeg.cmake index 9191d00613..5eba00d2e7 100644 --- a/Telegram/cmake/lib_ffmpeg.cmake +++ b/Telegram/cmake/lib_ffmpeg.cmake @@ -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 diff --git a/Telegram/cmake/lib_mtproto.cmake b/Telegram/cmake/lib_mtproto.cmake index 9d1352765e..bcd687b27f 100644 --- a/Telegram/cmake/lib_mtproto.cmake +++ b/Telegram/cmake/lib_mtproto.cmake @@ -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 ) diff --git a/Telegram/cmake/lib_scheme.cmake b/Telegram/cmake/lib_scheme.cmake index 8d3ac537e8..0689e9cd68 100644 --- a/Telegram/cmake/lib_scheme.cmake +++ b/Telegram/cmake/lib_scheme.cmake @@ -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 ) diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake index 22deae7bcb..71cfee061e 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -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 ) diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake index 0a6c4eead9..3630369eae 100644 --- a/Telegram/cmake/telegram_options.cmake +++ b/Telegram/cmake/telegram_options.cmake @@ -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) diff --git a/Telegram/codegen b/Telegram/codegen index dc530a1cec..69190a3375 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit dc530a1cecddf8291b7b67e71e455cef6b963e06 +Subproject commit 69190a33751b25dba7681e44656e608a575bbfb3 diff --git a/Telegram/lib_base b/Telegram/lib_base index c156e8eaf7..10b9bdc037 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit c156e8eaf7600545024625ce182995e9305ef6ff +Subproject commit 10b9bdc0374e5259b3211ac2d684118e6f6685a3 diff --git a/Telegram/lib_crl b/Telegram/lib_crl index 48bfce822d..0d9e70330a 160000 --- a/Telegram/lib_crl +++ b/Telegram/lib_crl @@ -1 +1 @@ -Subproject commit 48bfce822d5a3262e9b0643517a2a996125e1026 +Subproject commit 0d9e70330ac10891afd6775e52968805bd83b8a4 diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie index 03693ebccb..38bca2d3f2 160000 --- a/Telegram/lib_lottie +++ b/Telegram/lib_lottie @@ -1 +1 @@ -Subproject commit 03693ebccbc41af6279e3fcdb1e91ea23f9942b4 +Subproject commit 38bca2d3f2bbf7c4a3c39f744490eb9fb869138c diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl index 2423c26360..370de851fe 160000 --- a/Telegram/lib_rpl +++ b/Telegram/lib_rpl @@ -1 +1 @@ -Subproject commit 2423c263604441616fbe402bafa07101bb2dc29d +Subproject commit 370de851feff5612954189deb16a2154d6d1ef2d diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck index e4ac966708..62e220b9f1 160000 --- a/Telegram/lib_spellcheck +++ b/Telegram/lib_spellcheck @@ -1 +1 @@ -Subproject commit e4ac966708205159a696435021a7c1a6ccd71dae +Subproject commit 62e220b9f142b64071fd21d64bdbccf665acc2fd diff --git a/Telegram/lib_storage b/Telegram/lib_storage index 1ed6307b81..aee02d865b 160000 --- a/Telegram/lib_storage +++ b/Telegram/lib_storage @@ -1 +1 @@ -Subproject commit 1ed6307b816d368c20848e653e47498292c607c4 +Subproject commit aee02d865b67cfc2215d2e3f7e21be9e1f723376 diff --git a/Telegram/lib_tl b/Telegram/lib_tl index 54f5073dc4..5e1b052bf7 160000 --- a/Telegram/lib_tl +++ b/Telegram/lib_tl @@ -1 +1 @@ -Subproject commit 54f5073dc49b518f75e57352fde5df47973791d5 +Subproject commit 5e1b052bf788e50671be38b46a6818e14cf92e24 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index b7af3b71a3..8e30342137 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit b7af3b71a3f7ee93cb2ea70cdeb16a8a3ff06bce +Subproject commit 8e3034213761ba98a916b16ad230560e5695c856 diff --git a/cmake b/cmake index 118ce81dd4..33612794c6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 118ce81dd412306900f862be412b419cf243cfa2 +Subproject commit 33612794c6343b95835aa66d07dd10af99a873de