[Bf-blender-cvs] [1791697] master: Fix macOS 10.9 build when using OIIO without FFmpeg.

Brecht Van Lommel noreply at git.blender.org
Sun Dec 4 20:28:30 CET 2016


Commit: 1791697d4337eecf6a6007772b165b9142e7fcc1
Author: Brecht Van Lommel
Date:   Sun Dec 4 13:49:34 2016 +0100
Branches: master
https://developer.blender.org/rB1791697d4337eecf6a6007772b165b9142e7fcc1

Fix macOS 10.9 build when using OIIO without FFmpeg.

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

M	build_files/cmake/platform/platform_apple.cmake

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

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 0083cca..04485e3 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -316,6 +316,9 @@ if(WITH_OPENIMAGEIO)
 		${OPENEXR_LIBRARIES}
 		${ZLIB_LIBRARIES}
 	)
+	if(WITH_CXX11)
+		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a)
+	endif()
 	set(OPENIMAGEIO_LIBPATH
 		${OPENIMAGEIO}/lib
 		${JPEG_LIBPATH}




More information about the Bf-blender-cvs mailing list