diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-11-13 15:02:32 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-11-13 15:02:32 +0300 |
| commit | a347ec08bce5ec2abef46f0173845e8ba5958395 (patch) | |
| tree | ddb054b537369fcc7095b3ace155b24e57d86ba7 /source/creator/CMakeLists.txt | |
| parent | 7f1fadba67718434efecb7aa2c0aaf8dbea6f042 (diff) | |
| parent | ee8e4b7db87be54fb24872c666a1675bcd21fce6 (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 45127da0afa..656a6ec310f 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) @@ -810,6 +816,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 @@ -1067,3 +1082,10 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE) VS_USER_PROPS "blender.Cpp.user.props" ) endif() + +# ----------------------------------------------------------------------------- +# Post-install script + +if(POSTINSTALL_SCRIPT) + install(SCRIPT ${POSTINSTALL_SCRIPT}) +endif() |