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/blenlib | |
| 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/blenlib')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index b7827d62851..0c25da325ad 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -32,6 +32,9 @@ set(INC ../gpu ../../../intern/ghost ../../../intern/guardedalloc +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -134,12 +137,12 @@ set(SRC ) if(WITH_BINRELOC) + list(APPEND INC_SYS "${BINRELOC_INC}") add_definitions(-DWITH_BINRELOC) - list(APPEND INC "${BINRELOC_INC}") endif() if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() -blender_add_lib(bf_blenlib "${SRC}" "${INC}") +blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}") |