From 5adc06d2d89819522a355cec6bd3022e1b2f41d3 Mon Sep 17 00:00:00 2001 From: Maxime Chambonnet Date: Fri, 17 Dec 2021 17:42:31 +0100 Subject: install_deps: Fix OIIO and OSL build with OpenEXR Root path variables for those libraries is now using the 'standard' naming scheme. With tweaks/cleanups from @mont29. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D13591 --- build_files/build_environment/install_deps.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build_files') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 24294df14ed..2936ab1ed8e 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2083,9 +2083,9 @@ compile_OIIO() { cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION" if [ "$_with_built_openexr" = true ]; then - cmake_d="$cmake_d -D ILMBASE_HOME=$INST/openexr" - cmake_d="$cmake_d -D OPENEXR_HOME=$INST/openexr" - INFO "ILMBASE_HOME=$INST/openexr" + cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr" + cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr" + INFO "Ilmbase_ROOT=$INST/openexr" fi # ptex is only needed when nicholas bishop is ready @@ -2374,9 +2374,9 @@ compile_OSL() { #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" if [ "$_with_built_openexr" = true ]; then - INFO "ILMBASE_HOME=$INST/openexr" - cmake_d="$cmake_d -D OPENEXR_ROOT_DIR=$INST/openexr" - cmake_d="$cmake_d -D ILMBASE_ROOT_DIR=$INST/openexr" + cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr" + cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr" + INFO "Ilmbase_ROOT=$INST/openexr" # XXX Temp workaround... sigh, ILMBase really messed the things up by defining their custom names ON by default :( fi -- cgit v1.2.3