[Bf-blender-cvs] [a54185e] alembic_basic_io: install_deps.sh: fix building of Alembic 1.6.0 on Linux.

Kévin Dietrich noreply at git.blender.org
Fri Jul 8 08:42:06 CEST 2016


Commit: a54185eb54418bd7e5b4abde61b2b65ca49578f8
Author: Kévin Dietrich
Date:   Fri Jul 8 08:41:57 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBa54185eb54418bd7e5b4abde61b2b65ca49578f8

install_deps.sh: fix building of Alembic 1.6.0 on Linux.

Differential Revision: D2091

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

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 6874e66..7230fc4 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2219,10 +2219,13 @@ compile_ALEMBIC() {
 
     cd $_src
 
-    cmake_d="-D CMAKE_INSTALL_PREFIX=$INST"  # Alembic's build files append "alembic-1.5.8 to the end of CMAKE_INSTALL_PREFIX" so must install in parent dir.
+    cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst"
 
     if [ -d $INST/boost ]; then
       cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
+      cmake_d="$cmake_d -D USE_STATIC_BOOST=ON"
+    else
+      cmake_d="$cmake_d -D USE_STATIC_BOOST=OFF"
     fi
 
     if [ "$_with_built_openexr" = true ]; then
@@ -2234,7 +2237,6 @@ compile_ALEMBIC() {
       cmake_d="$cmake_d -D USE_MAYA=OFF"
       cmake_d="$cmake_d -D USE_PRMAN=OFF"
       cmake_d="$cmake_d -D USE_PYALEMBIC=OFF"
-      cmake_d="$cmake_d -D USE_STATIC_BOOST=ON"
       cmake_d="$cmake_d -D USE_STATIC_HDF5=OFF"
       cmake_d="$cmake_d -D ALEMBIC_ILMBASE_LINK_STATIC=OFF"
       cmake_d="$cmake_d -D ALEMBIC_SHARED_LIBS=OFF"




More information about the Bf-blender-cvs mailing list