Use namespaced library aliases.

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
+22 -23
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()
+3 -2
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
)
+2 -1
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
+2 -1
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
)
+3 -2
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
)
+2 -1
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
)
+1 -1
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)
+1 -1
Submodule cmake updated: 118ce81dd4...33612794c6