Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files/cmake/platform/platform_unix.cmake')
-rw-r--r--build_files/cmake/platform/platform_unix.cmake18
1 files changed, 12 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index dce78fb0c8e..317ea0af4ae 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -179,13 +179,19 @@ endif()
if(WITH_CODEC_FFMPEG)
if(EXISTS ${LIBDIR})
set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
- # Override FFMPEG components to also include static library dependencies.
- # included with precompiled libraries.
+ # Override FFMPEG components to also include static library dependencies
+ # included with precompiled libraries, and to ensure correct link order.
set(FFMPEG_FIND_COMPONENTS
- avcodec avdevice avformat avutil
- mp3lame ogg opus swresample swscale
- theora theoradec theoraenc vorbis vorbisenc
- vorbisfile vpx x264 xvidcore)
+ avformat avcodec avdevice avutil swresample swscale
+ sndfile
+ FLAC
+ mp3lame
+ opus
+ theora theoradec theoraenc
+ vorbis vorbisenc vorbisfile ogg
+ vpx
+ x264
+ xvidcore)
elseif(FFMPEG)
# Old cache variable used for root dir, convert to new standard.
set(FFMPEG_ROOT_DIR ${FFMPEG})