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:
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 50b4f3edfa9..8a85c75cade 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -81,6 +81,12 @@ if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
endif()
+if(WITH_TBB)
+ blender_include_dirs(${TBB_INCLUDE_DIRS})
+ link_directories(${LIBDIR}/tbb/lib)
+endif()
+
+
if(WITH_PYTHON)
blender_include_dirs(../blender/python)
add_definitions(-DWITH_PYTHON)
@@ -806,6 +812,15 @@ elseif(WIN32)
)
endif()
+ if(WITH_TBB_MALLOC_PROXY)
+ install(
+ FILES
+ ${LIBDIR}/tbb/lib/tbbmalloc.dll
+ ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll
+ DESTINATION "."
+ )
+ endif()
+
if(WITH_CODEC_SNDFILE)
install(
FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll