svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / modifiers / CMakeLists.txt
index 40f0ad1..f374de3 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
-       . ./intern
-       ../blenlib
-       ../makesdna
+set(INC 
+       .
+       intern
        ../blenkernel
        ../blenkernel/intern
+       ../blenlib
+       ../blenloader
+       ../makesdna
+       ../makesrna
        ../render/extern/include
-       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
-       ${ZLIB_INC}
+       ../../../intern/guardedalloc
+)
+
+set(INC_SYS
+       ${ZLIB_INCLUDE_DIRS}
 )
 
-SET(SRC
+set(SRC
        intern/MOD_armature.c
        intern/MOD_array.c
        intern/MOD_bevel.c
@@ -73,22 +79,39 @@ SET(SRC
        intern/MOD_surface.c
        intern/MOD_util.c
        intern/MOD_uvproject.c
+       intern/MOD_warp.c
        intern/MOD_wave.c
+       intern/MOD_weightvg_util.c
+       intern/MOD_weightvgedit.c
+       intern/MOD_weightvgmix.c
+       intern/MOD_weightvgproximity.c
+
+       MOD_modifiertypes.h
+       intern/MOD_boolean_util.h
+       intern/MOD_fluidsim_util.h
+       intern/MOD_util.h
+       intern/MOD_weightvg_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(WITH_MOD_BOOLEAN)
+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(WITH_MOD_BOOLEAN)
+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}")