[Bf-blender-cvs] [9df1e0cad54] master: Fix: Build error with MSVC

Ray Molenkamp noreply at git.blender.org
Thu Jun 10 14:50:11 CEST 2021


Commit: 9df1e0cad54599c53a1eb877651fceb461d88148
Author: Ray Molenkamp
Date:   Thu Jun 10 06:50:05 2021 -0600
Branches: master
https://developer.blender.org/rB9df1e0cad54599c53a1eb877651fceb461d88148

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.

===================================================================

M	build_files/cmake/platform/platform_win32.cmake

===================================================================

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()



More information about the Bf-blender-cvs mailing list