diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-03 14:44:44 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-03 14:46:12 +0400 |
| commit | a4408f405d914464e1085e07a52cba85b88afcc7 (patch) | |
| tree | 35e9b4b2a2c262c2f4bb76949326edd0e22e925d /build_files/build_environment | |
| parent | b7f085d9c128f31d576c732c6439b5a71e8922ee (diff) | |
install_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might help in some cases...
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 8 |
1 files 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 |