Merging r38390 through r38418 from trunk into soc-2011-tomato
[blender-staging.git] / source / creator / CMakeLists.txt
index 43fec85b5bf6f28e64a15f7dc353e5465a43d640..c1f0560bc1cb9cb5f993b265c9cc5812a042fec7 100644 (file)
@@ -72,6 +72,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)
@@ -744,6 +749,7 @@ endif()
                bf_editor_space_time
                bf_editor_space_userpref
                bf_editor_space_view3d
+               bf_editor_space_clip
 
                bf_editor_text
                bf_editor_transform
@@ -800,6 +806,7 @@ endif()
                bf_intern_smoke
                extern_minilzo
                extern_lzma
+               extern_colamd
                ge_logic_ketsji
                ge_phys_common
                ge_logic
@@ -823,6 +830,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()