diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 08:04:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 08:04:53 +0400 |
| commit | 6cc8f734c0f17554e2aea4c2ea88e097e3a4199c (patch) | |
| tree | d9b7fab2d64a02b59a674c35116cf502904ff7c0 /build_files | |
| parent | e636893b1b362840dca779c33b6dca87be5dd0bd (diff) | |
| parent | b73fe01295636aea92bf3076874b5e3cbcba9057 (diff) | |
svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index ca1dd79cd8e..8a1f6875b6f 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -114,6 +114,9 @@ macro(SETUP_LIBDIRS) link_directories(${PCRE_LIBPATH}) link_directories(${EXPAT_LIBPATH}) endif() + if(WITH_MEM_JEMALLOC) + link_directories(${JEMALLOC_LIBPATH}) + endif() if(WIN32 AND NOT UNIX) link_directories(${PTHREADS_LIBPATH}) @@ -220,6 +223,9 @@ macro(setup_liblinks target_link_libraries(${target} optimized ${LCMS_LIB}) endif() endif() + if(WITH_MEM_JEMALLOC) + target_link_libraries(${target} ${JEMALLOC_LIBRARY}) + endif() if(WIN32 AND NOT UNIX) target_link_libraries(${target} ${PTHREADS_LIB}) endif() |