Merging r40265 through r40492 from trunk into soc-2011-tomato
[blender.git] / source / creator / CMakeLists.txt
index 0b5d9f7..2ac15d8 100644 (file)
@@ -69,6 +69,11 @@ if(WITH_IMAGE_HDR)
        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)
@@ -754,6 +759,7 @@ endif()
                bf_editor_space_time
                bf_editor_space_userpref
                bf_editor_space_view3d
+               bf_editor_space_clip
 
                bf_editor_text
                bf_editor_transform
@@ -810,6 +816,7 @@ endif()
                bf_intern_smoke
                extern_minilzo
                extern_lzma
+               extern_colamd
                ge_logic_ketsji
                extern_recastnavigation
                ge_phys_common
@@ -833,6 +840,10 @@ endif()
                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()