merge with/from trunk at r35190

1 files changed, 65 insertions, 11 deletions

diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index d0b5ade199a..0352aa8c05f 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -24,26 +24,80 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC intern/*.c)
-
-SET(INC 
+set(INC 
 	. ./intern
 	../blenlib
+	../blenloader
 	../makesdna
 	../blenkernel
 	../blenkernel/intern
 	../bmesh
 	../render/extern/include
-    ../../../intern/guardedalloc
-	../../../intern/decimation/extern
+	../../../intern/guardedalloc
 	../../../intern/elbeem/extern
-	../../../intern/bsp/extern
-	${ZLIB_INC}
+	${ZLIB_INCLUDE_DIRS}
 )
 
-IF(NOT WITH_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+set(SRC
+	intern/MOD_armature.c
+	intern/MOD_array.c
+	intern/MOD_bevel.c
+	intern/MOD_boolean.c
+	intern/MOD_build.c
+	intern/MOD_cast.c
+	intern/MOD_cloth.c
+	intern/MOD_collision.c
+	intern/MOD_curve.c
+	intern/MOD_decimate.c
+	intern/MOD_displace.c
+	intern/MOD_edgesplit.c
+	intern/MOD_explode.c
+	intern/MOD_fluidsim.c
+	intern/MOD_fluidsim_util.c
+	intern/MOD_hook.c
+	intern/MOD_lattice.c
+	intern/MOD_mask.c
+	intern/MOD_meshdeform.c
+	intern/MOD_mirror.c
+	intern/MOD_multires.c
+	intern/MOD_none.c
+	intern/MOD_particleinstance.c
+	intern/MOD_particlesystem.c
+	intern/MOD_screw.c
+	intern/MOD_shapekey.c
+	intern/MOD_shrinkwrap.c
+	intern/MOD_simpledeform.c
+	intern/MOD_smoke.c
+	intern/MOD_smooth.c
+	intern/MOD_softbody.c
+	intern/MOD_solidify.c
+	intern/MOD_subsurf.c
+	intern/MOD_surface.c
+	intern/MOD_util.c
+	intern/MOD_uvproject.c
+	intern/MOD_wave.c
+
+	MOD_modifiertypes.h
+	intern/MOD_boolean_util.h
+	intern/MOD_fluidsim_util.h
+	intern/MOD_util.h
+)
+
+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}")