Cycles: svn merge -r41232:41266 ^/trunk/blender

[blender-staging.git] / source / blender / imbuf / CMakeLists.txt

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 1b190ae96def6ffd5825abf55486d92c96c62dd2..6aef9a4254e64c2f0f088d79fbeeb02d2d131b44 100644 (file)
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -62,6 +62,7 @@ set(SRC
        intern/metadata.c
        intern/module.c
        intern/moviecache.c
+       intern/openimageio.cpp
        intern/png.c
        intern/readimage.c
        intern/rectop.c
@@ -177,4 +178,11 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WITH_OPENIMAGEIO)
+       list(APPEND INC_SYS
+               ${OPENIMAGEIO_INCLUDES}
+       )
+       # disabled for now add_definitions(-DWITH_OPENIMAGEIO ${OPENIMAGEIO_DEFINITIONS})
+endif()
+
 blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")