Merging r46495 through r46557 from trunk into soc-2011-tomato
[blender-staging.git] / source / creator / CMakeLists.txt
index 75e893d8897aada307988d6414e830122b24b26d..a689dfb1db1d2631f49a319ab8807a32bfc10778 100644 (file)
@@ -441,7 +441,7 @@ if(UNIX AND NOT APPLE)
                        
                        if(WITH_PYTHON_INSTALL_NUMPY)
                                install(
-                                       DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy
+                                       DIRECTORY ${PYTHON_NUMPY_PATH}/numpy
                                        DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}/python${PYTHON_VERSION}/site-packages
                                        PATTERN ".svn" EXCLUDE
                                        PATTERN "__pycache__" EXCLUDE           # * any cache *
@@ -566,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()
 
@@ -579,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)
@@ -904,6 +916,7 @@ endif()
 
        if(WITH_LIBMV)
                list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+               list(APPEND BLENDER_SORTED_LIBS extern_ceres)
        endif()
 
        if(WITH_MOD_CLOTH_ELTOPO)