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 /build_files/cmake | |
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 'build_files/cmake')
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 25b4f5fd81d..5076057e0f6 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -596,7 +596,7 @@ if(WITH_SYSTEM_AUDASPACE) endif() if(WITH_TBB) - set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib) + set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/debug/tbb_debug.lib) set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include) set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) if(WITH_TBB_MALLOC_PROXY) |