Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 6af9f8a71ee643a6c2740f1cbdb6dd680ed8c936..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
@@ -79,11 +76,11 @@ set(SRC
        intern/blender_undo.c
        intern/blendfile.c
        intern/bmfont.c
-       intern/boids.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
@@ -150,13 +147,8 @@ set(SRC
        intern/outliner_treehash.c
        intern/packedFile.c
        intern/paint.c
-       intern/particle.c
-       intern/particle_child.c
-       intern/particle_distribute.c
-       intern/particle_system.c
        intern/pbvh.c
        intern/pbvh_bmesh.c
-       intern/pointcache.c
        intern/property.c
        intern/report.c
        intern/rigidbody.c
@@ -205,11 +197,11 @@ set(SRC
        BKE_blendfile.h
        BKE_bmfont.h
        BKE_bmfont_types.h
-       BKE_boids.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
@@ -269,9 +261,7 @@ set(SRC
        BKE_outliner_treehash.h
        BKE_packedFile.h
        BKE_paint.h
-       BKE_particle.h
        BKE_pbvh.h
-       BKE_pointcache.h
        BKE_property.h
        BKE_report.h
        BKE_rigidbody.h
@@ -503,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