diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:28:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:28:00 +0400 |
commit | 8949387186ef59bd0ba28cfe0c0e14a3ab5ac2d6 (patch) | |
tree | e5746dba9292c4383730b092d09536247516bb5a /source/blender/blenlib/CMakeLists.txt | |
parent | 08d6932c860e7f2926e3980764fc5e11a821d0a3 (diff) | |
parent | 09da9d43931a09e3786343e724a3de7217285d0d (diff) |
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
-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 833449aaf24..674a020edb0 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} ) @@ -139,12 +142,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}") |