Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 8f253e1219a502ffeea2f3ea37566c8ee559b442..ca55ba0226a7f11a8f6c6234f63325683b11895d 100644 (file)
@@ -49,9 +49,6 @@ set(INC
        ../../../intern/smoke/extern
        ../../../intern/atomic
        ../../../intern/libmv
-
-       # XXX - BAD LEVEL CALL WM_api.h
-       ../windowmanager
 )
 
 set(INC_SYS
@@ -75,11 +72,15 @@ set(SRC
        intern/armature_update.c
        intern/autoexec.c
        intern/blender.c
+       intern/blender_copybuffer.c
+       intern/blender_undo.c
+       intern/blendfile.c
        intern/bmfont.c
        intern/bpath.c
        intern/brush.c
        intern/bullet.c
        intern/bvhutils.c
+       intern/cachefile.c
        intern/camera.c
        intern/cdderivedmesh.c
        intern/cloth.c
@@ -117,7 +118,9 @@ set(SRC
        intern/lamp.c
        intern/lattice.c
        intern/library.c
+       intern/library_idmap.c
        intern/library_query.c
+       intern/library_remap.c
        intern/linestyle.c
        intern/mask.c
        intern/mask_evaluate.c
@@ -146,7 +149,6 @@ set(SRC
        intern/paint.c
        intern/pbvh.c
        intern/pbvh_bmesh.c
-       intern/pointcache.c
        intern/property.c
        intern/report.c
        intern/rigidbody.c
@@ -189,12 +191,17 @@ set(SRC
        BKE_armature.h
        BKE_autoexec.h
        BKE_blender.h
+       BKE_blender_copybuffer.h
+       BKE_blender_undo.h
+       BKE_blender_version.h
+       BKE_blendfile.h
        BKE_bmfont.h
        BKE_bmfont_types.h
        BKE_bpath.h
        BKE_brush.h
        BKE_bullet.h
        BKE_bvhutils.h
+       BKE_cachefile.h
        BKE_camera.h
        BKE_ccg.h
        BKE_cdderivedmesh.h
@@ -231,7 +238,9 @@ set(SRC
        BKE_lamp.h
        BKE_lattice.h
        BKE_library.h
+       BKE_library_idmap.h
        BKE_library_query.h
+       BKE_library_remap.h
        BKE_linestyle.h
        BKE_main.h
        BKE_mask.h
@@ -253,7 +262,6 @@ set(SRC
        BKE_packedFile.h
        BKE_paint.h
        BKE_pbvh.h
-       BKE_pointcache.h
        BKE_property.h
        BKE_report.h
        BKE_rigidbody.h
@@ -407,7 +415,7 @@ if(WITH_PYTHON)
        endif()
 
 
-       if (PYTHON_EXECUTABLE)
+       if(PYTHON_EXECUTABLE)
                get_filename_component(_python_exe_name ${PYTHON_EXECUTABLE} NAME)
                add_definitions(-DPYTHON_EXECUTABLE_NAME=${_python_exe_name})
                unset(_python_exe_name)
@@ -485,6 +493,13 @@ if(WITH_FREESTYLE)
        add_definitions(-DWITH_FREESTYLE)
 endif()
 
+if(WITH_ALEMBIC)
+       list(APPEND INC
+               ../alembic
+       )
+       add_definitions(-DWITH_ALEMBIC)
+endif()
+
 if(WITH_OPENSUBDIV)
        add_definitions(-DWITH_OPENSUBDIV)
        list(APPEND INC_SYS