[Bf-blender-cvs] [7fc7df1bd3d] master: CMake: Fix linking of ffmpeg_test on macOS
Sergey Sharybin
noreply at git.blender.org
Thu Jan 16 15:52:27 CET 2020
Commit: 7fc7df1bd3d81f7dd7440a958b420e356c2bf732
Author: Sergey Sharybin
Date: Thu Jan 16 15:50:34 2020 +0100
Branches: master
https://developer.blender.org/rB7fc7df1bd3d81f7dd7440a958b420e356c2bf732
CMake: Fix linking of ffmpeg_test on macOS
Part of the issue was missing library path to png library.
Other part was missing iconv passed to linker.
===================================================================
M tests/gtests/ffmpeg/CMakeLists.txt
===================================================================
diff --git a/tests/gtests/ffmpeg/CMakeLists.txt b/tests/gtests/ffmpeg/CMakeLists.txt
index 8eea5d6c57b..dbd4f9f1fed 100644
--- a/tests/gtests/ffmpeg/CMakeLists.txt
+++ b/tests/gtests/ffmpeg/CMakeLists.txt
@@ -21,7 +21,10 @@
set(INC
.
..
+
${FFMPEG_INCLUDE_DIRS}
+ ${PNG_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
)
set(LIB
@@ -34,6 +37,8 @@ if(WITH_IMAGE_OPENJPEG)
set(LIB ${LIB} ${OPENJPEG_LIBRARIES})
endif()
+setup_platform_linker_flags()
+link_directories(${FFMPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH})
include_directories(${INC})
BLENDER_SRC_GTEST(ffmpeg "ffmpeg_codecs.cc" "${LIB}")
More information about the Bf-blender-cvs
mailing list