Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index f051ca7f07e000eb16f645ec9e7c891998721775..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
@@ -83,6 +80,7 @@ set(SRC
        intern/brush.c
        intern/bullet.c
        intern/bvhutils.c
+       intern/cachefile.c
        intern/camera.c
        intern/cdderivedmesh.c
        intern/cloth.c
@@ -120,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
@@ -201,6 +201,7 @@ set(SRC
        BKE_brush.h
        BKE_bullet.h
        BKE_bvhutils.h
+       BKE_cachefile.h
        BKE_camera.h
        BKE_ccg.h
        BKE_cdderivedmesh.h
@@ -237,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
@@ -490,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