[Bf-blender-cvs] [6d9d24e3d45] master: msvc: Use debug versions of tbb malloc for debug builds

[Ray Molenkamp]

Commit: 6d9d24e3d4592a628e56fc10b177af63336474c4
Author: Ray Molenkamp
Date:   Sun Nov 17 14:26:29 2019 -0700
Branches: master
https://developer.blender.org/rB6d9d24e3d4592a628e56fc10b177af63336474c4

msvc: Use debug versions of tbb malloc for debug builds

Using the release versions gave unpredictable results when
the msvc debugger was attached for some developers.

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

M	build_files/build_environment/cmake/tbb.cmake
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake
index 597c1bfe00c..8bd2f3160d0 100644
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -59,6 +59,8 @@ if(WIN32)
     ExternalProject_Add_Step(external_tbb after_install
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc_proxy.dll
       DEPENDEES install
     )
   endif()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0f8cfee795f..6e2d9acec32 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -818,6 +818,14 @@ elseif(WIN32)
         ${LIBDIR}/tbb/lib/tbbmalloc.dll
         ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll
       DESTINATION "."
+      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+    )
+    install(
+      FILES
+        ${LIBDIR}/tbb/lib/debug/tbbmalloc.dll
+        ${LIBDIR}/tbb/lib/debug/tbbmalloc_proxy.dll
+      DESTINATION "."
+      CONFIGURATIONS Debug
     )
   endif()