svn merge ^/trunk/blender -r47961:48070
[blender.git] / source / creator / CMakeLists.txt
index e8b951f..19cc9cc 100644 (file)
@@ -395,6 +395,13 @@ if(UNIX AND NOT APPLE)
                )
        endif()
 
+       if(WITH_OPENCOLORIO)
+               install(
+                       DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
+                       DESTINATION ${TARGETDIR_VER}/datafiles
+               )
+       endif()
+
        if(WITH_PYTHON)
                if(WITH_PYTHON_INSTALL)
                        # on some platforms (like openSUSE) Python is linked
@@ -625,6 +632,17 @@ elseif(WIN32)
                endif()
        endif()
 
+       if(WITH_OPENCOLORIO)
+               if(NOT MINGW)
+                       set_lib_path(OCIOBIN "opencolorio/bin")
+                       install(
+                               FILES
+                                       ${OCIOBIN}/OpenColorIO.dll
+                               DESTINATION ${TARGETDIR}
+                       )
+               endif()
+       endif()
+
 elseif(APPLE)
 
        # handy install macro to exclude files, we use \$ escape for the "to"
@@ -897,6 +915,7 @@ endif()
                bf_compositor #added for opencl compositor
                bf_opencl #added for opencl compositor
                bf_intern_raskter
+               bf_intern_opencolorio
        )
 
        if(WITH_LIBMV)