diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-11-18 00:26:29 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-11-18 00:26:29 +0300 |
| commit | 6d9d24e3d4592a628e56fc10b177af63336474c4 (patch) | |
| tree | be870614c94e784672868a683e2d1e368b031ffe | |
| parent | 67fa8d2307a6b41c5bbbbfc79f96af6135c360fe (diff) | |
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.
| -rw-r--r-- | build_files/build_environment/cmake/tbb.cmake | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 0 deletions
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() |