From a4408f405d914464e1085e07a52cba85b88afcc7 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 3 May 2014 12:44:44 +0200 Subject: [PATCH] install_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might help in some cases... --- build_files/build_environment/install_deps.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 15ba8ded2d5..af296f9f050 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1202,11 +1202,12 @@ compile_OIIO() { cmake_d="$cmake_d -D BUILDSTATIC=OFF" cmake_d="$cmake_d -D LINKSTATIC=OFF" + cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" + 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 ILMBASE_VERSION=$ILMBASE_VERSION" cmake_d="$cmake_d -D OPENEXR_HOME=$INST/openexr" - cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION" fi # Optional tests and cmd tools @@ -1433,9 +1434,10 @@ compile_OSL() { cmake_d="$cmake_d -D STOP_ON_WARNING=OFF" cmake_d="$cmake_d -D BUILDSTATIC=OFF" + cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" + if [ $_with_built_openexr == true ]; then cmake_d="$cmake_d -D ILMBASE_HOME=$INST/openexr" - cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" fi if [ -d $INST/boost ]; then