Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-05-31 09:28:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-31 09:28:00 +0400
commit8949387186ef59bd0ba28cfe0c0e14a3ab5ac2d6 (patch)
treee5746dba9292c4383730b092d09536247516bb5a /source/blender/modifiers/CMakeLists.txt
parent08d6932c860e7f2926e3980764fc5e11a821d0a3 (diff)
parent09da9d43931a09e3786343e724a3de7217285d0d (diff)
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
-rw-r--r--source/blender/modifiers/CMakeLists.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index ede55eafbf7..657c20a06a3 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -35,6 +35,9 @@ set(INC
../render/extern/include
../../../intern/guardedalloc
../../../intern/elbeem/extern
+)
+
+set(INC_SYS
${ZLIB_INCLUDE_DIRS}
)
@@ -87,9 +90,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()
@@ -102,4 +103,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}")