diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-05-08 18:58:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-05-08 19:05:30 +0300 |
| commit | e517734708fd98315781c6bbc249ea6b8c6a80d9 (patch) | |
| tree | 3645336ffa8bc07cb5fcaa4dbc919c2a219c2261 /build_files/build_environment/install_deps.sh | |
| parent | 7d8c5d56235f2dd3fc770ebdf0f930a0727001dd (diff) | |
install_deps: Fix (unreported) broken logic in OIIO building.
Not sure where that code was comming from, but it was breaking the
cleanup/update_deps logic...
Diffstat (limited to 'build_files/build_environment/install_deps.sh')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 764828af332..5ea7d180250 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1625,7 +1625,7 @@ compile_OCIO() { _init_openexr() { _src=$SRC/OpenEXR-$OPENEXR_VERSION _git=false - _inst=$_openexr_inst + _inst=$INST/openexr-$OPENEXR_VERSION _inst_shortcut=$INST/openexr } @@ -1661,7 +1661,6 @@ compile_OPENEXR() { clean_OPENEXR fi - _openexr_inst=$INST/openexr-$OPENEXR_VERSION PRINT "" _init_openexr @@ -1707,7 +1706,7 @@ compile_OPENEXR() { mkdir build cd build - cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_openexr_inst" + cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" cmake_d="$cmake_d -D CMAKE_INSTALL_DOCDIR=/dev/null" # Hack, there is no option to disable that currently... cmake_d="$cmake_d -D BUILD_SHARED_LIBS=ON" cmake_d="$cmake_d -D BUILD_TESTING=OFF" |