diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-06-04 18:16:03 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-06-04 18:16:03 +0300 |
| commit | eb030204f198fe1b933380c63bd40f3dba58c105 (patch) | |
| tree | 587e72090a847bf80a15912ed5fd136cdfdb72b8 /source/creator/CMakeLists.txt | |
| parent | 56005ef499894bcd48313e3df7ec965fe516c1dc (diff) | |
windows/deps: Fix TBB build issues.
rB847579b42250 updated the TBB build script
which had some unintended consequences for
windows as the directory layout slightly
changed.
This change adjusts the builder to the new
structure, there are no version/functional
changes.
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 92cc4ae297a..519b3781103 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -883,13 +883,13 @@ elseif(WIN32) if(WITH_TBB) install( FILES - ${LIBDIR}/tbb/lib/tbb.dll + ${LIBDIR}/tbb/bin/tbb.dll DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel ) install( FILES - ${LIBDIR}/tbb/lib/debug/tbb_debug.dll + ${LIBDIR}/tbb/bin/tbb_debug.dll DESTINATION "." CONFIGURATIONS Debug ) @@ -897,15 +897,15 @@ elseif(WIN32) if(WITH_TBB_MALLOC_PROXY) install( FILES - ${LIBDIR}/tbb/lib/tbbmalloc.dll - ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll + ${LIBDIR}/tbb/bin/tbbmalloc.dll + ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel ) install( FILES - ${LIBDIR}/tbb/lib/debug/tbbmalloc.dll - ${LIBDIR}/tbb/lib/debug/tbbmalloc_proxy.dll + ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll + ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll DESTINATION "." CONFIGURATIONS Debug ) |