diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-05-04 01:25:56 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-05-04 01:25:56 +0300 |
| commit | 33bdd91fb825c9ccba514d93e28a61b4c089f2f4 (patch) | |
| tree | 6e30971872718956428879a1d17ffa5c62680f14 /source/creator/CMakeLists.txt | |
| parent | 70fe988dc497ce4de6269aa28f579c528e2ac797 (diff) | |
Windows: Move tbb to being dynamic library
Static tbb has always been frowned upon [1] sofar it has worked for us but
given our reliance on tbb is about to increase (D7475), I'd like to move the library
to more supported configuration. Which means moving it to be a dynamic library
The libs part of this change is in rBL62416
Reviewed By: Brecht
Differential Revision: https://developer.blender.org/D7570
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a634618ee94..b3e83b1412f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -814,7 +814,20 @@ elseif(WIN32) DESTINATION "." ) endif() - + if(WITH_TBB) + install( + FILES + ${LIBDIR}/tbb/lib/tbb.dll + DESTINATION "." + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + ) + install( + FILES + ${LIBDIR}/tbb/lib/debug/tbb_debug.dll + DESTINATION "." + CONFIGURATIONS Debug + ) + endif() if(WITH_TBB_MALLOC_PROXY) install( FILES |