Merge with trunk r37546
[blender-staging.git] / source / blender / modifiers / CMakeLists.txt
index c14787aeae7b796e8cdc8b89de5d06ada32e9354..206cbc3f2bdc0ee8a49fbdbcee332dd8abe8f679 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
        . ./intern
        ../blenlib
+       ../blenloader
        ../makesdna
        ../blenkernel
        ../blenkernel/intern
        ../render/extern/include
        ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
-       ${ZLIB_INC}
 )
 
-SET(SRC
+set(INC_SYS
+       ${ZLIB_INCLUDE_DIRS}
+)
+
+set(SRC
        intern/MOD_armature.c
        intern/MOD_array.c
        intern/MOD_bevel.c
@@ -48,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
@@ -73,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
@@ -81,21 +87,23 @@ SET(SRC
        intern/MOD_util.h
 )
 
-IF(WITH_MOD_BOOLEAN)
-       ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN)
-       LIST(APPEND SRC
+if(WITH_MOD_BOOLEAN)
+       add_definitions(-DWITH_MOD_BOOLEAN)
+       list(APPEND SRC
                intern/MOD_boolean_util.c
        )
-       LIST(APPEND INC ../../../intern/bsp/extern)
-ENDIF(WITH_MOD_BOOLEAN)
+       list(APPEND INC
+               ../../../intern/bsp/extern
+       )
+endif()
 
-IF(WITH_MOD_DECIMATE)
-       ADD_DEFINITIONS(-DWITH_MOD_DECIMATE)
-       LIST(APPEND INC ../../../intern/decimation/extern)
-ENDIF(WITH_MOD_DECIMATE)
+if(WITH_MOD_DECIMATE)
+       add_definitions(-DWITH_MOD_DECIMATE)
+       list(APPEND INC ../../../intern/decimation/extern)
+endif()
 
-IF(NOT WITH_MOD_FLUID)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_MOD_FLUID)
+if(NOT WITH_MOD_FLUID)
+       add_definitions(-DDISABLE_ELBEEM)
+endif()
 
-BLENDERLIB(bf_modifiers "${SRC}" "${INC}")
+blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")