procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Use absolute paths instead of target_link_directories.

Browse source
This commit is contained in:
John Preston 2019-11-29 13:56:07 +03:00
parent 90de0b687f
commit 2f2d698545
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/cmake/lib_ffmpeg.cmake
View file

@ -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
)

2
Telegram/lib_tl

@ -1 +1 @@
Subproject commit 294f36dfaa657303ea19764f639f3f6e0b3e2062
Subproject commit 18cde5931f09a82a142bc39a4af5ae4cfad74b94

2
cmake

@ -1 +1 @@
Subproject commit 52eaa9cd61e5529e461f1a4d5adc730cd7fb493f
Subproject commit b28ca5aca22384180bf7d9cade8d26b7471dadc3