Merge with trunk r37546
[blender-staging.git] / source / blender / modifiers / CMakeLists.txt
index c610a2fbdda7b2d735a683c14e65318fa5c76734..206cbc3f2bdc0ee8a49fbdbcee332dd8abe8f679 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../render/extern/include
        ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+)
+
+set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
 )
 
@@ -49,6 +52,7 @@ set(SRC
        intern/MOD_curve.c
        intern/MOD_decimate.c
        intern/MOD_displace.c
+       intern/MOD_dynamicpaint.c
        intern/MOD_edgesplit.c
        intern/MOD_explode.c
        intern/MOD_fluidsim.c
@@ -74,6 +78,7 @@ set(SRC
        intern/MOD_surface.c
        intern/MOD_util.c
        intern/MOD_uvproject.c
+       intern/MOD_warp.c
        intern/MOD_wave.c
 
        MOD_modifiertypes.h
@@ -87,7 +92,9 @@ if(WITH_MOD_BOOLEAN)
        list(APPEND SRC
                intern/MOD_boolean_util.c
        )
-       list(APPEND INC ../../../intern/bsp/extern)
+       list(APPEND INC
+               ../../../intern/bsp/extern
+       )
 endif()
 
 if(WITH_MOD_DECIMATE)
@@ -99,4 +106,4 @@ if(NOT WITH_MOD_FLUID)
        add_definitions(-DDISABLE_ELBEEM)
 endif()
 
-blender_add_lib(bf_modifiers "${SRC}" "${INC}")
+blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")