Merging r49711 through r49737 from trunk into soc-2011-tomato
[blender.git] / source / creator / CMakeLists.txt
index a3a3a13130c4fec9197fa08849d34bbe837cbb12..40862fef3096b2831f4c2313d15995525c45b17d 100644 (file)
@@ -301,6 +301,15 @@ if(WITH_INTERNATIONAL)
        )
 endif()
 
+# color management
+if(WITH_OPENCOLORIO)
+       install(
+               DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
+               DESTINATION ${TARGETDIR_VER}/datafiles
+               PATTERN ".svn" EXCLUDE
+       )
+endif()
+
 # helpful tip when using make
 if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
        # message after building.
@@ -636,6 +645,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"
@@ -905,6 +925,7 @@ endif()
                cycles_util
                cycles_subd
                bf_intern_raskter
+               bf_intern_opencolorio
        )
 
        if(WITH_COMPOSITOR)