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:
authorRay Molenkamp <github@lazydodo.com>2021-06-10 15:50:05 +0300
committerRay Molenkamp <github@lazydodo.com>2021-06-10 15:50:05 +0300
commit9df1e0cad54599c53a1eb877651fceb461d88148 (patch)
tree8fb00562aac621072053de8e945fc62fc1f08a05 /build_files/cmake/platform/platform_win32.cmake
parentaa0bd29546d412d5d3af591af6104a7a5532446a (diff)
Fix: Build error with MSVC
rB4f81b4b4ce29 mistakenly left out the changes to platform_win32.cmake causing a linker error when WITH_GMP and WITH_TBB_MALLOC_PROXY were on.
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index fe5b179d6d1..99a2cb7966f 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -679,6 +679,7 @@ if(WITH_TBB)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
if(WITH_TBB_MALLOC_PROXY)
+ set(TBB_MALLOC_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbbmalloc.lib debug ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib)
add_definitions(-DWITH_TBB_MALLOC)
endif()
endif()