svn merge ^/trunk/blender -r47961:48070
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 08:16:07 +0000 (08:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 08:16:07 +0000 (08:16 +0000)
1  2 
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt

@@@ -30,6 -30,7 +30,7 @@@ set(IN
        ../blenlib
        ../blenloader
        ../editors/include
+       ../editors/io
        ../gpu
        ../imbuf
        ../makesdna
@@@ -142,12 -143,4 +143,12 @@@ if(WIN322
        )
  endif()
  
 +if(WITH_OPENCOLORIO)
 +      add_definitions(-DWITH_OCIO)
 +endif()
 +
 +if(WITH_OPENCOLORIO)
 +      add_definitions(-DWITH_OCIO)
 +endif()
 +
  blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
@@@ -395,13 -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
@@@ -632,17 -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"
@@@ -842,6 -824,7 +842,7 @@@ endif(
                bf_editor_animation
                bf_editor_datafiles
                bf_editor_mask
+               bf_editor_io
  
                bf_render
                bf_intern_opennl
                bf_compositor #added for opencl compositor
                bf_opencl #added for opencl compositor
                bf_intern_raskter
 +              bf_intern_opencolorio
        )
  
        if(WITH_LIBMV)