Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

msvc: Use debug versions of tbb malloc for debug builds

Browse Source 
Using the release versions gave unpredictable results when
the msvc debugger was attached for some developers.
This commit is contained in:
Ray Molenkamp
2019-11-17 14:26:29 -07:00
parent 67fa8d2307
commit 6d9d24e3d4
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/cmake/tbb.cmake
View File

@@ -59,6 +59,8 @@ if(WIN32)
ExternalProject_Add_Step(external_tbb after_install 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/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_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 DEPENDEES install
) )
endif() endif()

8
source/creator/CMakeLists.txt
View File

@@ -818,6 +818,14 @@ elseif(WIN32)
${LIBDIR}/tbb/lib/tbbmalloc.dll ${LIBDIR}/tbb/lib/tbbmalloc.dll
${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll
DESTINATION "." DESTINATION "."
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES
${LIBDIR}/tbb/lib/debug/tbbmalloc.dll
${LIBDIR}/tbb/lib/debug/tbbmalloc_proxy.dll
DESTINATION "."
CONFIGURATIONS Debug
) )
endif() endif()