[Bf-blender-cvs] [9028384] master: install_deps.sh: Fix output conf for CMake (specifying root dirs for OIIO/OCIO is not needed when you use default path, but mandatory otherwise, simpler to always give them).

[Bastien Montagne]

Commit: 90283843e3eebdc651bd7f74f1f0dded8dfa3238
Author: Bastien Montagne
Date:   Sat Jan 18 16:03:23 2014 +0100
https://developer.blender.org/rB90283843e3eebdc651bd7f74f1f0dded8dfa3238

install_deps.sh: Fix output conf for CMake (specifying root dirs for OIIO/OCIO is not needed when you use default path, but mandatory otherwise, simpler to always give them).

Spotted by dingto on IRC, thanks!

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 5dc6c51..27ee010 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2877,12 +2877,24 @@ print_info() {
     fi
   fi
 
+  if [ -d $INST/ocio ]; then
+    _1="-D OPENCOLORIO_ROOT_DIR=$INST/ocio"
+    PRINT "  $_1"
+    _buildargs="$_buildargs $_1"
+  fi
+
   if [ -d $INST/openexr ]; then
     _1="-D OPENEXR_ROOT_DIR=$INST/openexr"
     PRINT "  $_1"
     _buildargs="$_buildargs $_1"
   fi
 
+  if [ -d $INST/oiio ]; then
+    _1="-D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
+    PRINT "  $_1"
+    _buildargs="$_buildargs $_1"
+  fi
+
   _1="-D WITH_CYCLES_OSL=ON"
   _2="-D WITH_LLVM=ON"
   _3="-D LLVM_VERSION=$LLVM_VERSION_FOUND"