Merge trunk up to revision 40611
[blender.git] / source / creator / CMakeLists.txt
index a2cd7c23c061ef906cb01afcc5fe2bdf63694390..592307b6f2c02eec7c95139a8176e85c550b6985 100644 (file)
@@ -69,6 +69,11 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WITH_LIBMV)
+       blender_include_dirs(../../extern/libmv)
+       add_definitions(-DWITH_LIBMV)
+endif()
+
 if(WITH_PYTHON)
        blender_include_dirs(../blender/python)
        add_definitions(-DWITH_PYTHON)
 if(WITH_PYTHON)
        blender_include_dirs(../blender/python)
        add_definitions(-DWITH_PYTHON)
@@ -835,6 +840,7 @@ endif()
                bf_editor_space_time
                bf_editor_space_userpref
                bf_editor_space_view3d
                bf_editor_space_time
                bf_editor_space_userpref
                bf_editor_space_view3d
+               bf_editor_space_clip
 
                bf_editor_text
                bf_editor_transform
 
                bf_editor_text
                bf_editor_transform
@@ -891,6 +897,7 @@ endif()
                bf_intern_smoke
                extern_minilzo
                extern_lzma
                bf_intern_smoke
                extern_minilzo
                extern_lzma
+               extern_colamd
                ge_logic_ketsji
                extern_recastnavigation
                ge_phys_common
                ge_logic_ketsji
                extern_recastnavigation
                ge_phys_common
@@ -914,6 +921,10 @@ endif()
                bf_intern_mikktspace
        )
 
                bf_intern_mikktspace
        )
 
+       if(WITH_LIBMV)
+               list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+       endif()
+
        if(WITH_MOD_CLOTH_ELTOPO)
                list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
        endif()
        if(WITH_MOD_CLOTH_ELTOPO)
                list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
        endif()