Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 0865efb5ba70f093a7ddb7d70bda3dceb439fa6b..ca55ba0226a7f11a8f6c6234f63325683b11895d 100644 (file)
@@ -46,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
@@ -76,12 +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/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
@@ -119,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,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
@@ -195,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
@@ -238,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
@@ -259,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
@@ -413,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)
@@ -471,20 +478,6 @@ if(WITH_LIBMV)
        add_definitions(-DWITH_LIBMV)
 endif()
 
-if(WITH_LIBMV_WERROR)
-       if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-               set_source_files_properties(intern/tracking.c
-                                           intern/tracking_auto.c
-                                           intern/tracking_detect.c
-                                           intern/tracking_plane_tracker.c
-                                           intern/tracking_region_tracker.c
-                                           intern/tracking_solver.c
-                                           intern/tracking_stabilize.c
-                                           intern/tracking_util.c
-                                           PROPERTIES COMPILE_FLAGS -Werror)
-       endif()
-endif()
-
 if(WITH_FFTW3)
        list(APPEND INC_SYS
                ${FFTW3_INCLUDE_DIRS}
@@ -500,21 +493,31 @@ 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}
        )
-       if(WITH_SUBSURF_WERROR)
-               if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-                       set_source_files_properties(intern/CCGSubSurf.c
-                                                   intern/CCGSubSurf_legacy.c
-                                                   intern/CCGSubSurf_opensubdiv.c
-                                                   intern/CCGSubSurf_opensubdiv_converter.c
-                                                   intern/CCGSubSurf_util.c
-                                                   PROPERTIES COMPILE_FLAGS -Werror)
-               endif()
+endif()
+
+if(WITH_OPENVDB)
+       add_definitions(-DWITH_OPENVDB)
+       list(APPEND INC
+                ../../../intern/openvdb
+       )
+
+       if(WITH_OPENVDB_BLOSC)
+               add_definitions(
+                       -DWITH_OPENVDB_BLOSC
+               )
        endif()
 endif()