Merge with trunk r37546
[blender-staging.git] / source / blender / modifiers / CMakeLists.txt
index 99e8c05b1ae33b3d4f68a44ccee68971a9389622..206cbc3f2bdc0ee8a49fbdbcee332dd8abe8f679 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
        . ./intern
        ../blenlib
+       ../blenloader
        ../makesdna
        ../blenkernel
        ../blenkernel/intern
        ../render/extern/include
-    ../../../intern/guardedalloc
-       ../../../intern/decimation/extern
+       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
-       ../../../intern/bsp/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
        intern/MOD_boolean.c
-       intern/MOD_boolean_util.c
        intern/MOD_build.c
        intern/MOD_cast.c
        intern/MOD_cloth.c
@@ -51,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
@@ -76,12 +78,32 @@ 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
+       intern/MOD_boolean_util.h
+       intern/MOD_fluidsim_util.h
+       intern/MOD_util.h
 )
 
-IF(NOT WITH_FLUID)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+if(WITH_MOD_BOOLEAN)
+       add_definitions(-DWITH_MOD_BOOLEAN)
+       list(APPEND SRC
+               intern/MOD_boolean_util.c
+       )
+       list(APPEND INC
+               ../../../intern/bsp/extern
+       )
+endif()
+
+if(WITH_MOD_DECIMATE)
+       add_definitions(-DWITH_MOD_DECIMATE)
+       list(APPEND INC ../../../intern/decimation/extern)
+endif()
 
-BLENDERLIB(bf_modifiers "${SRC}" "${INC}")
+if(NOT WITH_MOD_FLUID)
+       add_definitions(-DDISABLE_ELBEEM)
+endif()
 
+blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")