[Bf-blender-cvs] [fb758b097cd] tmp_libupdate_34: attempt to fix ffmpeg test on windows

Ray Molenkamp noreply at git.blender.org
Wed Aug 17 22:14:51 CEST 2022


Commit: fb758b097cdfc306064304f677f686375cd06bdd
Author: Ray Molenkamp
Date:   Wed Aug 17 14:14:11 2022 -0600
Branches: tmp_libupdate_34
https://developer.blender.org/rBfb758b097cdfc306064304f677f686375cd06bdd

attempt to fix ffmpeg test on windows

I can't seem to reproduce the failing test on
my local system, i'm moving the ffmpeg test into
the blender_test executable rather than it's own
binary, hopefully that'll do the trick as all
other tests seem to pass in that one.

===================================================================

M	intern/ffmpeg/CMakeLists.txt

===================================================================

diff --git a/intern/ffmpeg/CMakeLists.txt b/intern/ffmpeg/CMakeLists.txt
index 0de8496f3f3..fd5a593f700 100644
--- a/intern/ffmpeg/CMakeLists.txt
+++ b/intern/ffmpeg/CMakeLists.txt
@@ -21,5 +21,5 @@ if(WITH_GTESTS)
     set(TEST_LIB ${TEST_LIB} ${OPENJPEG_LIBRARIES})
   endif()
   include(GTestTesting)
-  blender_add_test_executable(ffmpeg "${TEST_SRC}" "${TEST_INC}" "${TEST_INC_SYS}" "${TEST_LIB}")
+  blender_add_test_lib(ffmpeg_codecs "${TEST_SRC}" "${TEST_INC}" "${TEST_INC_SYS}" "${TEST_LIB}")
 endif()



More information about the Bf-blender-cvs mailing list