[Bf-blender-cvs] [7314ede784] blender-v2.78b-release: Fix compilation error with latest OIIO 1.7.8

Sergey Sharybin noreply at git.blender.org
Thu Jan 26 13:47:07 CET 2017


Commit: 7314ede784ab1b3df834dce1b3ac75a902a5459d
Author: Sergey Sharybin
Date:   Tue Nov 29 12:40:38 2016 +0100
Branches: blender-v2.78b-release
https://developer.blender.org/rB7314ede784ab1b3df834dce1b3ac75a902a5459d

Fix compilation error with latest OIIO 1.7.8

There are some changes in OIIO includes so now need to do some
things differently.

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

M	source/blender/imbuf/intern/oiio/CMakeLists.txt

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

diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index c873fa3f32..a4fb9c5aee 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -49,6 +49,11 @@ if(WITH_OPENIMAGEIO)
 		${OPENIMAGEIO_INCLUDE_DIRS}
 		${BOOST_INCLUDE_DIR}
 	)
+	if(WITH_IMAGE_OPENEXR)
+		list(APPEND INC_SYS
+			${OPENEXR_INCLUDE_DIRS}
+		)
+	endif()
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()




More information about the Bf-blender-cvs mailing list