diff options
| author | Brecht Van Lommel <brecht> | 2022-01-12 20:21:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-12 20:25:24 +0300 |
| commit | 62a0de1673302fb7f15fe06efaf6f0f97d92d240 (patch) | |
| tree | fb65de056a47428bd607c2076e40f3c16a9e3838 /build_files/cmake/Modules/FindFFmpeg.cmake | |
| parent | bab47b60cb69c500869a3339654ad7d48dddf385 (diff) | |
CMake: use FFmpeg find module on Linux
And change install_deps.sh to build shared (instead of static) FFMPEG
libraries, for consistency with other library dependencies and to simplify
the logic. This may require users of install_deps.sh to rebuild FFMPEG.
This is the last step that lets us get rid of LIBPATH variables and
link_directories() entirely, as recommended by the CMake docs.
Some fixes were needed in the find FFMPEG module to make it actually work,
this code was unused up to now.
Followup to D8855.
Differential Revision: https://developer.blender.org/D9177
Diffstat (limited to 'build_files/cmake/Modules/FindFFmpeg.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindFFmpeg.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake index 0765c1dc901..5f506a33e13 100644 --- a/build_files/cmake/Modules/FindFFmpeg.cmake +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -33,6 +33,8 @@ if(NOT FFMPEG_FIND_COMPONENTS) avfilter avformat avutil + swscale + swresample ) endif() @@ -50,9 +52,9 @@ foreach(_component ${FFMPEG_FIND_COMPONENTS}) string(TOUPPER ${_component} _upper_COMPONENT) find_library(FFMPEG_${_upper_COMPONENT}_LIBRARY NAMES - ${_upper_COMPONENT} + ${_component} HINTS - ${LIBDIR}/ffmpeg + ${_ffmpeg_SEARCH_DIRS} PATH_SUFFIXES lib64 lib ) |