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 /intern/guardedalloc/CMakeLists.txt | |
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 'intern/guardedalloc/CMakeLists.txt')
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 4a534d94eb8..b3fe29af570 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -24,7 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC .) +set(INC + . +) + +set(INC_SYS + +) set(SRC ./intern/mallocn.c @@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX) ) endif() -blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}") +blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}") # Override C++ alloc, optional. if(WITH_CXX_GUARDEDALLOC) set(SRC cpp/mallocn.cpp ) - blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") + blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}") endif() |