From 2f2d698545f83391bdc2a3d9fa6912665c419855 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 29 Nov 2019 13:56:07 +0300 Subject: [PATCH] Use absolute paths instead of target_link_directories. --- Telegram/cmake/lib_ffmpeg.cmake | 15 ++++++--------- Telegram/lib_tl | 2 +- cmake | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Telegram/cmake/lib_ffmpeg.cmake b/Telegram/cmake/lib_ffmpeg.cmake index 5eba00d2e..fc1a41590 100644 --- a/Telegram/cmake/lib_ffmpeg.cmake +++ b/Telegram/cmake/lib_ffmpeg.cmake @@ -21,17 +21,14 @@ PUBLIC ${libs_loc}/ffmpeg ) -target_link_directories(lib_ffmpeg -PUBLIC - ${libs_loc}/ffmpeg -) +set(ffmpeg_lib_loc ${libs_loc}/ffmpeg) target_link_libraries(lib_ffmpeg PUBLIC desktop-app::lib_base - ${libs_loc}/ffmpeg/libavformat/libavformat.a - ${libs_loc}/ffmpeg/libavcodec/libavcodec.a - ${libs_loc}/ffmpeg/libavutil/libavutil.a - ${libs_loc}/ffmpeg/libswresample/libswresample.a - ${libs_loc}/ffmpeg/libswscale/libswscale.a + ${ffmpeg_lib_loc}/libavformat/libavformat.a + ${ffmpeg_lib_loc}/libavcodec/libavcodec.a + ${ffmpeg_lib_loc}/libavutil/libavutil.a + ${ffmpeg_lib_loc}/libswresample/libswresample.a + ${ffmpeg_lib_loc}/libswscale/libswscale.a ) diff --git a/Telegram/lib_tl b/Telegram/lib_tl index 294f36dfa..18cde5931 160000 --- a/Telegram/lib_tl +++ b/Telegram/lib_tl @@ -1 +1 @@ -Subproject commit 294f36dfaa657303ea19764f639f3f6e0b3e2062 +Subproject commit 18cde5931f09a82a142bc39a4af5ae4cfad74b94 diff --git a/cmake b/cmake index 52eaa9cd6..b28ca5aca 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 52eaa9cd61e5529e461f1a4d5adc730cd7fb493f +Subproject commit b28ca5aca22384180bf7d9cade8d26b7471dadc3