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 05:15:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-31 05:15:44 +0400
commit09da9d43931a09e3786343e724a3de7217285d0d (patch)
tree4c48fbd4404687fd04254d071d535499a1ae4058 /intern/smoke
parentdcd55cef86270f076cf827c5ae7a6cc76db4f9ad (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 'intern/smoke')
-rw-r--r--intern/smoke/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 486ef92f638..c787f54b284 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
intern
../memutil
../../extern/bullet2/src
+)
+
+set(INC_SYS
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
@@ -89,5 +92,5 @@ if(WITH_FFTW3)
list(APPEND INC ${FFTW3_INC})
endif()
-blender_add_lib(bf_intern_smoke "${SRC}" "${INC}")
+blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")