diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
commit | 09da9d43931a09e3786343e724a3de7217285d0d (patch) | |
tree | 4c48fbd4404687fd04254d071d535499a1ae4058 /source/blender/modifiers | |
parent | dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff) |
cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 7abcb331f08..cf66a27bda2 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -34,6 +34,9 @@ set(INC ../render/extern/include ../../../intern/guardedalloc ../../../intern/elbeem/extern +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ) @@ -85,9 +88,7 @@ set(SRC if(WITH_MOD_BOOLEAN) add_definitions(-DWITH_MOD_BOOLEAN) - list(APPEND SRC - intern/MOD_boolean_util.c - ) + list(APPEND SRC intern/MOD_boolean_util.c) list(APPEND INC ../../../intern/bsp/extern) endif() @@ -100,4 +101,4 @@ 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}") |