Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: Fix linking of ffmpeg_test on macOS

Browse Source 
Part of the issue was missing library path to png library.
Other part was missing iconv passed to linker.
This commit is contained in:
Sergey Sharybin
2020-01-16 15:50:34 +01:00
parent e7e454f964
commit 7fc7df1bd3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/gtests/ffmpeg/CMakeLists.txt
View File

@@ -21,7 +21,10 @@
set(INC set(INC
. .
.. ..
${FFMPEG_INCLUDE_DIRS} ${FFMPEG_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
) )
set(LIB set(LIB
@@ -34,6 +37,8 @@ if(WITH_IMAGE_OPENJPEG)
set(LIB ${LIB} ${OPENJPEG_LIBRARIES}) set(LIB ${LIB} ${OPENJPEG_LIBRARIES})
endif() endif()
setup_platform_linker_flags()
link_directories(${FFMPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH})
include_directories(${INC}) include_directories(${INC})
BLENDER_SRC_GTEST(ffmpeg "ffmpeg_codecs.cc" "${LIB}") BLENDER_SRC_GTEST(ffmpeg "ffmpeg_codecs.cc" "${LIB}")