From 90283843e3eebdc651bd7f74f1f0dded8dfa3238 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Sat, 18 Jan 2014 16:03:23 +0100
Subject: 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!
---
 build_files/build_environment/install_deps.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'build_files')

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 5dc6c51656c..27ee0102d9f 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"
-- 
cgit v1.2.3