diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
| commit | cb890a49fbd653c71d2fe639265a1a562136113f (patch) | |
| tree | 10ddd1f7198c85408f83794fe560caa9512e2a2e /source/blender/blenkernel/CMakeLists.txt | |
| parent | aea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (diff) | |
| parent | f086201518b85f6dd2ae60ae37dc14f1d1406c01 (diff) | |
svn merge ^/trunk/blender -r41602:41638 .
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 82a179eac4a..22ffbcbdd46 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -115,6 +115,7 @@ set(SRC intern/mesh_validate.c intern/modifier.c intern/modifiers_bmesh.c + intern/movieclip.c intern/multires.c intern/nla.c intern/node.c @@ -143,6 +144,7 @@ set(SRC intern/suggestions.c intern/text.c intern/texture.c + intern/tracking.c intern/unit.c intern/world.c intern/writeavi.c @@ -199,6 +201,7 @@ set(SRC BKE_mball.h BKE_mesh.h BKE_modifier.h + BKE_movieclip.h BKE_multires.h BKE_nla.h BKE_node.h @@ -226,6 +229,7 @@ set(SRC BKE_tessmesh.h BKE_text.h BKE_texture.h + BKE_tracking.h BKE_unit.h BKE_utildefines.h BKE_world.h @@ -369,6 +373,13 @@ if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() +if(WITH_LIBMV) + list(APPEND INC + ../../../extern/libmv + ) + add_definitions(-DWITH_LIBMV) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |