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
path: root/tests
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-01-16 17:50:34 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-01-16 17:52:19 +0300
commit7fc7df1bd3d81f7dd7440a958b420e356c2bf732 (patch)
tree4357541d95783dfa3b2501a6a7d2c4e8f871b193 /tests
parente7e454f964f9751dc6664b9e42aff9e87552d8de (diff)
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/gtests/ffmpeg/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
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}")