diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-10-04 18:07:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-10-04 18:35:21 +0300 |
| commit | 4d9588ee454e2b7170ee4e34c2a1b45baec736cc (patch) | |
| tree | ac4282fb80bb13616ea620204fc3555efe716dd8 /build_files | |
| parent | 25d162f8643992b0e6ec567e492667d47bddaa3b (diff) | |
Revert "install_deps: update OpenVDB for Blender 3.4."
This update has been moved back to Blender 3.5.
This reverts commit ded4604d7190adef56518dc0b65ddb452beefc16.
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index fa498b26c9b..814834ccf34 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -136,7 +136,7 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: Build and install the OpenImageDenoise libraries. --with-nanovdb - Build and install NanoVDB together with OpenVDB. + Build and install the NanoVDB branch of OpenVDB (instead of official release of OpenVDB). --with-jack Install the jack libraries. @@ -534,10 +534,10 @@ OSD_SKIP=false # OpenVDB needs to be compiled for now OPENVDB_BLOSC_VERSION="1.21.1" -OPENVDB_VERSION="9.1.0" -OPENVDB_VERSION_SHORT="9.1" +OPENVDB_VERSION="9.0.0" +OPENVDB_VERSION_SHORT="9.0" OPENVDB_VERSION_MIN="9.0" -OPENVDB_VERSION_MEX="9.2" +OPENVDB_VERSION_MEX="9.1" OPENVDB_FORCE_BUILD=false OPENVDB_FORCE_REBUILD=false OPENVDB_SKIP=false @@ -2919,10 +2919,6 @@ compile_OPENVDB() { cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" cmake_d="$cmake_d -D USE_STATIC_DEPENDENCIES=OFF" cmake_d="$cmake_d -D OPENVDB_BUILD_BINARIES=OFF" - # Unfortunately OpenVDB currently forces using recent oneTBB over older versions when it finds it, - # even when TBB_ROOT is specified. So have to prevent any check for system library - - # in the hope it will not break in some other cases. - cmake_d="$cmake_d -D DISABLE_CMAKE_SEARCH_PATHS=ON" if [ "$WITH_NANOVDB" = true ]; then cmake_d="$cmake_d -D USE_NANOVDB=ON" @@ -2935,6 +2931,7 @@ compile_OPENVDB() { cmake_d="$cmake_d -D Boost_USE_MULTITHREADED=ON" cmake_d="$cmake_d -D Boost_NO_SYSTEM_PATHS=ON" cmake_d="$cmake_d -D Boost_NO_BOOST_CMAKE=ON" + cmake_d="$cmake_d -D Boost_NO_BOOST_CMAKE=ON" fi if [ -d $INST/tbb ]; then cmake_d="$cmake_d -D TBB_ROOT=$INST/tbb" @@ -3198,7 +3195,7 @@ _init_opencollada() { _inst_shortcut=$INST/opencollada } -_update_deps_opencollada() { +_update_deps_collada() { : } @@ -6218,7 +6215,7 @@ print_info() { fi if [ -d $INST/nanovdb ]; then _1="-D WITH_NANOVDB=ON" - _2="-D NANOVDB_ROOT_DIR=$INST/openvdb" + _2="-D NANOVDB_ROOT_DIR=$INST/nanovdb" PRINT " $_1" PRINT " $_2" _buildargs="$_buildargs $_1 $_2" |