svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / modifiers / CMakeLists.txt
index 727d228..f374de3 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-       . ./intern
-       ../blenlib
-       ../makesdna
+       .
+       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
@@ -73,12 +79,18 @@ 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)
@@ -86,16 +98,20 @@ 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)
        add_definitions(-DWITH_MOD_DECIMATE)
-       list(APPEND INC ../../../intern/decimation/extern)
+       list(APPEND INC
+               ../../../intern/decimation/extern
+       )
 endif()
 
 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}")