[Bf-blender-cvs] [1b7fdb6] master: Fix missing 'WITH_OPENCOLORIO/OPENIMAGEIO' defines in install_deps final message.

Bastien Montagne noreply at git.blender.org
Mon Jan 4 21:01:15 CET 2016


Commit: 1b7fdb6a6086859679e265e5a2d59636fd9bdf4a
Author: Bastien Montagne
Date:   Mon Jan 4 20:59:52 2016 +0100
Branches: master
https://developer.blender.org/rB1b7fdb6a6086859679e265e5a2d59636fd9bdf4a

Fix missing 'WITH_OPENCOLORIO/OPENIMAGEIO' defines in install_deps final message.

Reported by venomgfx 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 b0c99f9..10d7c3d 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -3707,9 +3707,10 @@ print_info() {
   fi
 
   if [ -d $INST/ocio ]; then
-    _1="-D OPENCOLORIO_ROOT_DIR=$INST/ocio"
+    _1="-D WITH_OPENCOLORIO=ON"
+    _2="-D OPENCOLORIO_ROOT_DIR=$INST/ocio"
     PRINT "  $_1"
-    _buildargs="$_buildargs -U *OPENCOLORIO* $_1"
+    _buildargs="$_buildargs -U *OPENCOLORIO* $_1 $_2"
   fi
 
   if [ -d $INST/openexr ]; then
@@ -3719,9 +3720,10 @@ print_info() {
   fi
 
   if [ -d $INST/oiio ]; then
-    _1="-D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
+    _1="-D WITH_OPENIMAGEIO=ON"
+    _2="-D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
     PRINT "  $_1"
-    _buildargs="$_buildargs -U *OPENIMAGEIO* $_1"
+    _buildargs="$_buildargs -U *OPENIMAGEIO* $_1 $_2"
   fi
 
   if [ "$OSL_SKIP" = false ]; then




More information about the Bf-blender-cvs mailing list