Merging r46495 through r46557 from trunk into soc-2011-tomato
[blender-staging.git] / source / creator / CMakeLists.txt
index 0168c06b7dae69024514e42adae31290ae20a5e8..a689dfb1db1d2631f49a319ab8807a32bfc10778 100644 (file)
@@ -438,7 +438,28 @@ if(UNIX AND NOT APPLE)
 
                        # # doesnt work, todo
                        # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
+                       
+                       if(WITH_PYTHON_INSTALL_NUMPY)
+                               install(
+                                       DIRECTORY ${PYTHON_NUMPY_PATH}/numpy
+                                       DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}/python${PYTHON_VERSION}/site-packages
+                                       PATTERN ".svn" EXCLUDE
+                                       PATTERN "__pycache__" EXCLUDE           # * any cache *
+                                       PATTERN "*.pyc" EXCLUDE                 # * any cache *
+                                       PATTERN "*.pyo" EXCLUDE                 # * any cache *
+                                       PATTERN "distutils" EXCLUDE             # ./distutils
+                                       PATTERN "oldnumeric" EXCLUDE            # ./oldnumeric
+                                       PATTERN "doc" EXCLUDE                   # ./doc
+                                       PATTERN "tests" EXCLUDE                 # ./tests
+                                       PATTERN "f2py" EXCLUDE                  # ./f2py - fortran/python interface code, not fun for blender devs.
+                                       PATTERN "include" EXCLUDE               # include dirs all over, we wont use NumPy/CAPI
+                                       PATTERN "*.h" EXCLUDE                   # some includes are not in include dirs
+                                       PATTERN "*.a" EXCLUDE                   # ./core/lib/libnpymath.a - for linking, we dont need.
+                               )
+                       endif()
+                       
                        unset(_target_LIB)
+                       
                endif()
        endif()
 elseif(WIN32)
@@ -545,6 +566,11 @@ elseif(WIN32)
                                FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
                                DESTINATION ${TARGETDIR}
                        )
+               elseif(WITH_MINGW64)
+                       install(
+                               FILES ${LIBDIR}/binaries/pthreadGC2-w64.dll
+                               DESTINATION ${TARGETDIR}
+                       )
                endif()
        endif()
 
@@ -558,7 +584,14 @@ elseif(WIN32)
                                ${LIBDIR}/ffmpeg/lib/swscale-2.dll
                        DESTINATION ${TARGETDIR}
                )
-
+               if(WITH_MINGW64)
+               install(
+                       FILES
+                               ${LIBDIR}/ffmpeg/lib/swresample-0.dll
+                               ${LIBDIR}/ffmpeg/lib/xvidcore.dll
+                       DESTINATION ${TARGETDIR}
+               )
+               endif()
        endif()
 
        if(WITH_CODEC_SNDFILE)
@@ -807,6 +840,7 @@ endif()
                bf_editor_sound
                bf_editor_animation
                bf_editor_datafiles
+               bf_editor_mask
 
                bf_render
                bf_intern_opennl
@@ -877,10 +911,12 @@ endif()
                cycles_kernel
                cycles_util
                cycles_subd
+               bf_intern_raskter
        )
 
        if(WITH_LIBMV)
                list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+               list(APPEND BLENDER_SORTED_LIBS extern_ceres)
        endif()
 
        if(WITH_MOD_CLOTH_ELTOPO)