Cycles: svn merge -r41157:41182 ^/trunk/blender

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 5336fe6439ee9a96f3f45c6e7045c76cb0822700..6e3c486e788868b9efdb889b2f575054c006dc79 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -571,6 +571,14 @@ elseif(WIN32)
                DESTINATION ${TARGETDIR}
        )       
 
+       if(WITH_OPENIMAGEIO)
+               install(
+                       FILES
+                               ${LIBDIR}/openimageio/bin/OpenImageIO.dll
+                       DESTINATION ${TARGETDIR}
+               )
+       endif()
+
 elseif(APPLE)
        set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
        set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
@@ -716,6 +724,9 @@ elseif(APPLE)
        endif()
 endif()
 
+# install more files XXX pass target dir
+delayed_do_install(${TARGETDIR_VER})
+
 unset(BLENDER_TEXT_FILES)
 
 
@@ -736,6 +747,16 @@ if(WITH_MOD_FLUID)
        list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
 endif()
 
+if(WITH_CYCLES)
+       list(APPEND BLENDER_LINK_LIBS
+               cycles_render
+               cycles_bvh
+               cycles_device
+               cycles_kernel
+               cycles_util
+               cycles_subd)
+endif()
+
 #if(UNIX)
        # Sort libraries
        set(BLENDER_SORTED_LIBS
@@ -836,6 +857,15 @@ endif()
                bf_blenfont
                bf_intern_audaspace
                bf_intern_mikktspace
+               extern_recastnavigation
+               bf_editor_util          # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release!
+               bf_intern_cycles
+               cycles_render
+               cycles_bvh
+               cycles_device
+               cycles_kernel
+               cycles_util
+               cycles_subd
        )
 
        if(WITH_MOD_CLOTH_ELTOPO)