diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-05 13:00:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-06-05 13:01:18 +0300 |
| commit | 7d32a259bf909a2827cc5f328f8618d3b946182b (patch) | |
| tree | a3e0e77a10075104c57979939c6d7715f321648b /build_files/build_environment | |
| parent | 1c5479167fce0120786ee08849445440deec0097 (diff) | |
Installdeps: make embree use TBB.
Following changes done to makedeps in rBc7329da14b22.
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 0bb6ca9ab70..9d9b975288d 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1535,11 +1535,13 @@ _update_deps_tbb() { OSD_FORCE_REBUILD=true OPENVDB_FORCE_REBUILD=true USD_FORCE_REBUILD=true + EMBREE_FORCE_REBUILD=true OIDN_FORCE_REBUILD=true if [ "$_is_building" = true ]; then OSD_FORCE_BUILD=true OPENVDB_FORCE_BUILD=true USD_FORCE_BUILD=true + EMBREE_FORCE_BUILD=true OIDN_FORCE_BUILD=true fi } @@ -2985,7 +2987,7 @@ compile_Embree() { fi # To be changed each time we make edits that would modify the compiled results! - embree_magic=9 + embree_magic=10 _init_embree # Clean install if needed! @@ -3039,9 +3041,13 @@ compile_Embree() { cmake_d="$cmake_d -D EMBREE_RAY_MASK=ON" cmake_d="$cmake_d -D EMBREE_FILTER_FUNCTION=ON" cmake_d="$cmake_d -D EMBREE_BACKFACE_CULLING=OFF" - cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=INTERNAL" cmake_d="$cmake_d -D EMBREE_MAX_ISA=AVX2" + cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=TBB" + if [ -d $INST/tbb ]; then + make_d="$make_d EMBREE_TBB_ROOT=$INST/tbb" + fi + cmake $cmake_d ../ make -j$THREADS && make install |