diff options
| author | Maxime Chambonnet <Maxzor_2_what_the_fuck_blenderid> | 2021-12-17 19:42:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-12-20 14:52:07 +0300 |
| commit | 5adc06d2d89819522a355cec6bd3022e1b2f41d3 (patch) | |
| tree | d4de12e2eb37979c399151f38ff66d853028a12d /build_files | |
| parent | deb3d566a5ab3ee20e9e41bdb4835cd0f11928ed (diff) | |
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
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 12 |
1 files changed, 6 insertions, 6 deletions
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 |