[Bf-blender-cvs] [473bcff5cb4] master: Fix linking error with ffmpeg_test on Linux
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 15 11:43:09 CET 2020
Commit: 473bcff5cb45d276e0879868b617299d90d09580
Author: Brecht Van Lommel
Date: Wed Jan 15 11:39:34 2020 +0100
Branches: master
https://developer.blender.org/rB473bcff5cb45d276e0879868b617299d90d09580
Fix linking error with ffmpeg_test on Linux
The exact reason is unclear, but we might as well link just the few libraries
that are actually needed for ffmpeg.
===================================================================
M tests/gtests/ffmpeg/CMakeLists.txt
===================================================================
diff --git a/tests/gtests/ffmpeg/CMakeLists.txt b/tests/gtests/ffmpeg/CMakeLists.txt
index 2ccdd1ffa55..8eea5d6c57b 100644
--- a/tests/gtests/ffmpeg/CMakeLists.txt
+++ b/tests/gtests/ffmpeg/CMakeLists.txt
@@ -25,13 +25,15 @@ set(INC
)
set(LIB
-
+ ${PNG_LIBRARIES}
+ ${FFMPEG_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
-include_directories(${INC})
+if(WITH_IMAGE_OPENJPEG)
+ set(LIB ${LIB} ${OPENJPEG_LIBRARIES})
+endif()
-setup_libdirs()
+include_directories(${INC})
BLENDER_SRC_GTEST(ffmpeg "ffmpeg_codecs.cc" "${LIB}")
-
-setup_liblinks(ffmpeg_test)
More information about the Bf-blender-cvs
mailing list