Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index d94710a7373c7ab23739a9d19e096557592272c8..ca55ba0226a7f11a8f6c6234f63325683b11895d 100644 (file)
@@ -28,6 +28,8 @@ set(INC
        ../blenfont
        ../blenlib
        ../blenloader
+       ../blentranslation
+       ../depsgraph
        ../gpu
        ../ikplugin
        ../imbuf
@@ -44,13 +46,9 @@ set(INC
        ../../../intern/iksolver/extern
        ../../../intern/memutil
        ../../../intern/mikktspace
-       ../../../intern/raskter
        ../../../intern/smoke/extern
        ../../../intern/atomic
-       ../../../extern/libmv
-
-       # XXX - BAD LEVEL CALL WM_api.h
-       ../windowmanager
+       ../../../intern/libmv
 )
 
 set(INC_SYS
@@ -60,6 +58,10 @@ set(INC_SYS
 
 set(SRC
        intern/CCGSubSurf.c
+       intern/CCGSubSurf_legacy.c
+       intern/CCGSubSurf_opensubdiv.c
+       intern/CCGSubSurf_opensubdiv_converter.c
+       intern/CCGSubSurf_util.c
        intern/DerivedMesh.c
        intern/action.c
        intern/addon.c
@@ -67,14 +69,18 @@ set(SRC
        intern/anim_sys.c
        intern/appdir.c
        intern/armature.c
+       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/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
@@ -112,13 +118,16 @@ 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
        intern/mask_rasterize.c
        intern/material.c
        intern/mball.c
+       intern/mball_tessellate.c
        intern/mesh.c
        intern/mesh_evaluate.c
        intern/mesh_mapping.c
@@ -133,15 +142,13 @@ set(SRC
        intern/object.c
        intern/object_deform.c
        intern/object_dupli.c
+       intern/object_update.c
        intern/ocean.c
+       intern/outliner_treehash.c
        intern/packedFile.c
        intern/paint.c
-       intern/particle.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
@@ -170,7 +177,6 @@ set(SRC
        intern/tracking_solver.c
        intern/tracking_stabilize.c
        intern/tracking_util.c
-       intern/treehash.c
        intern/unit.c
        intern/world.c
        intern/writeavi.c
@@ -185,13 +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_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
@@ -209,6 +219,8 @@ set(SRC
        BKE_depsgraph.h
        BKE_displist.h
        BKE_dynamicpaint.h
+       BKE_editmesh.h
+       BKE_editmesh_bvh.h
        BKE_effect.h
        BKE_fcurve.h
        BKE_fluidsim.h
@@ -226,12 +238,15 @@ 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
        BKE_material.h
        BKE_mball.h
+       BKE_mball_tessellate.h
        BKE_mesh.h
        BKE_mesh_mapping.h
        BKE_mesh_remap.h
@@ -243,11 +258,10 @@ set(SRC
        BKE_object.h
        BKE_object_deform.h
        BKE_ocean.h
+       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
@@ -263,12 +277,9 @@ set(SRC
        BKE_speaker.h
        BKE_subsurf.h
        BKE_suggestions.h
-       BKE_editmesh.h
-       BKE_editmesh_bvh.h
        BKE_text.h
        BKE_texture.h
        BKE_tracking.h
-       BKE_treehash.h
        BKE_unit.h
        BKE_utildefines.h
        BKE_world.h
@@ -279,6 +290,8 @@ set(SRC
        nla_private.h
        tracking_private.h
        intern/CCGSubSurf.h
+       intern/CCGSubSurf_inline.h
+       intern/CCGSubSurf_intern.h
        intern/pbvh_intern.h
        intern/data_transfer_intern.h
 )
@@ -299,10 +312,11 @@ if(WIN32)
 endif()
 
 if(WITH_AUDASPACE)
-       list(APPEND INC
-               ../../../intern/audaspace/intern
+       add_definitions(${AUDASPACE_DEFINITIONS})
+
+       list(APPEND INC_SYS
+               ${AUDASPACE_C_INCLUDE_DIRS}
        )
-       add_definitions(-DWITH_AUDASPACE)
 endif()
 
 if(WITH_BULLET)
@@ -399,6 +413,13 @@ if(WITH_PYTHON)
        if(WITH_PYTHON_SECURITY)
                add_definitions(-DWITH_PYTHON_SECURITY)
        endif()
+
+
+       if(PYTHON_EXECUTABLE)
+               get_filename_component(_python_exe_name ${PYTHON_EXECUTABLE} NAME)
+               add_definitions(-DPYTHON_EXECUTABLE_NAME=${_python_exe_name})
+               unset(_python_exe_name)
+       endif()
 endif()
 
 if(WITH_MOD_FLUID)
@@ -421,9 +442,16 @@ if(WITH_JACK)
 endif()
 
 if(WITH_LZO)
-       list(APPEND INC_SYS
-               ../../../extern/lzo/minilzo
-       )
+       if(WITH_SYSTEM_LZO)
+               list(APPEND INC_SYS
+                       ${LZO_INCLUDE_DIR}
+               )
+               add_definitions(-DWITH_SYSTEM_LZO)
+       else()
+               list(APPEND INC_SYS
+                       ../../../extern/lzo/minilzo
+               )
+       endif()
        add_definitions(-DWITH_LZO)
 endif()
 
@@ -465,9 +493,41 @@ 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
+               ../../../intern/opensubdiv
+               ${OPENSUBDIV_INCLUDE_DIRS}
+       )
+endif()
+
+if(WITH_OPENVDB)
+       add_definitions(-DWITH_OPENVDB)
+       list(APPEND INC
+                ../../../intern/openvdb
+       )
+
+       if(WITH_OPENVDB_BLOSC)
+               add_definitions(
+                       -DWITH_OPENVDB_BLOSC
+               )
+       endif()
+endif()
+
 ## Warnings as errors, this is too strict!
 #if(MSVC)
 #      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 #endif()
 
+if(WITH_LEGACY_DEPSGRAPH)
+       add_definitions(-DWITH_LEGACY_DEPSGRAPH)
+endif()
+
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")