Commit: e8a4bddef4ffe2dc41b88127b7153c49a4465783
Author: Ray Molenkamp
Date: Thu Jun 10 12:03:12 2021 -0600
Branches: master
https://developer.blender.org/rBe8a4bddef4ffe2dc41b88127b7153c49a4465783
deps/windows: add missing tbbmalloc_debug.lib
This file is being linked by blender without
it existing causing issues for debug builds.
===================================================================
M build_files/build_environment/cmake/tbb.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/tbb.cmake
b/build_files/build_environment/cmake/tbb.cmake
index 005616a9f8d..c08ecebc069 100644
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -79,6 +79,7 @@ if(WIN32)
# Normal collection of build artifacts
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib
${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb_debug.dll
${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib
${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll
${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
