blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

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...
This commit is contained in:
Bastien Montagne 2020-05-08 17:58:00 +02:00
parent 7d8c5d5623
commit e517734708
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/build_environment/install_deps.sh
View File

@ -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"