[Bf-blender-cvs] [367278e] alembic_pointcache: Alembic: Fixes for linux buildbot and scons

[Sergey Sharybin]

Commit: 367278e1b5e8f370f87ba8577ec62d10cee1b9d6
Author: Sergey Sharybin
Date:   Thu Mar 5 17:11:51 2015 +0500
Branches: alembic_pointcache
https://developer.blender.org/rB367278e1b5e8f370f87ba8577ec62d10cee1b9d6

Alembic: Fixes for linux buildbot and scons

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

M	build_files/buildbot/config/user-config-glibc211-i686.py
M	build_files/buildbot/config/user-config-glibc211-x86_64.py
M	build_files/scons/tools/Blender.py
M	build_files/scons/tools/btools.py
M	source/blender/pointcache/alembic/SConscript
M	source/blender/pointcache/alembic/abc_writer.cpp

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

diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py
index 06c43be..d9c3fe5 100644
--- a/build_files/buildbot/config/user-config-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-glibc211-i686.py
@@ -166,6 +166,19 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 # Ocean Simulation
 WITH_BF_OCEANSIM = True
 
+# Alembic
+WITH_BF_HDF5 = False
+WITH_BF_ALEMBIC = True
+WITH_BF_STATICALEMBIC = True
+BF_ALEMBIC = '/opt/lib/alembic'
+BF_ALEMBIC_INC = '${BF_ALEMBIC}/include'
+BF_ALEMBIC_LIBPATH = '${BF_ALEMBIC}/lib/static'
+BF_ALEMBIC_LIB_STATIC = '${BF_ALEMBIC_LIBPATH}/libAlembicAbcGeom.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbc.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicAbcCollection.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreFactory.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreOgawa.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcMaterial.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicOgawa.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreAbstract.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicUtil.a'
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py
index 29f6143..cc19472 100644
--- a/build_files/buildbot/config/user-config-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py
@@ -166,6 +166,19 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 # Ocean Simulation
 WITH_BF_OCEANSIM = True
 
+# Alembic
+WITH_BF_HDF5 = False
+WITH_BF_ALEMBIC = True
+WITH_BF_STATICALEMBIC = True
+BF_ALEMBIC = '/opt/lib/alembic'
+BF_ALEMBIC_INC = '${BF_ALEMBIC}/include'
+BF_ALEMBIC_LIBPATH = '${BF_ALEMBIC}/lib/static'
+BF_ALEMBIC_LIB_STATIC = '${BF_ALEMBIC_LIBPATH}/libAlembicAbcGeom.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbc.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicAbcCollection.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreFactory.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreOgawa.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcMaterial.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicOgawa.a ${BF_ALEMBIC_LIBPATH}/libAlembicAbcCoreAbstract.a ' + \
+    '${BF_ALEMBIC_LIBPATH}/libAlembicUtil.a'
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index a0db403..710041d 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -210,6 +210,8 @@ def setup_staticlibs(lenv):
 
     if lenv['WITH_BF_ALEMBIC']:
         libincs += Split(lenv['BF_ALEMBIC_LIBPATH'])
+        if lenv['WITH_BF_STATICALEMBIC']:
+            statlibs += Split(lenv['BF_ALEMBIC_LIB_STATIC'])
 
     if lenv['WITH_BF_OPENEXR']:
         libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
@@ -295,7 +297,8 @@ def setup_syslibs(lenv):
         syslibs += Split(lenv['BF_HDF5_LIB'])
 
     if lenv['WITH_BF_ALEMBIC']:
-        syslibs += Split(lenv['BF_ALEMBIC_LIB'])
+        if not lenv['WITH_BF_STATICALEMBIC']:
+            syslibs += Split(lenv['BF_ALEMBIC_LIB'])
 
     if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
         syslibs += Split(lenv['BF_OPENEXR_LIB'])
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 20a2050..9990428 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -182,7 +182,8 @@ def validate_arguments(args, bc):
             'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_INTERNATIONAL', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
             'WITH_BF_LIBMV', 'WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS',
             'WITH_BF_CYCLES_OSL', 'WITH_BF_STATICOSL', 'BF_OSL', 'BF_OSL_INC', 'BF_OSL_LIB', 'BF_OSL_LIBPATH', 'BF_OSL_LIB_STATIC', 'BF_OSL_COMPILER',
-            'WITH_BF_LLVM', 'WITH_BF_STATICLLVM', 'BF_LLVM', 'BF_LLVM_LIB', 'BF_LLVM_LIBPATH', 'BF_LLVM_LIB_STATIC', 'BF_PROGRAM_LINKFLAGS'
+            'WITH_BF_LLVM', 'WITH_BF_STATICLLVM', 'BF_LLVM', 'BF_LLVM_LIB', 'BF_LLVM_LIBPATH', 'BF_LLVM_LIB_STATIC', 'BF_PROGRAM_LINKFLAGS',
+            'WITH_BF_ALEMBIC', 'BF_ALEMBIC', 'BF_ALEMBIC_INC', 'BF_ALEMBIC_LIB', 'BF_ALEMBIC_LIBPATH',
             ]
 
     # Have options here that scons expects to be lists
@@ -587,9 +588,11 @@ def read_opts(env, cfg, args):
         ('BF_HDF5_LIBPATH', 'HDF5 library path', ''),
 
         (BoolVariable('WITH_BF_ALEMBIC', 'Use Alembic if true', False)),
+        (BoolVariable('WITH_BF_STATICALEMBIC', 'Staticly link to Alembic', False)),
         ('BF_ALEMBIC', 'Alembic base path', ''),
         ('BF_ALEMBIC_INC', 'Alembic include path', ''),
         ('BF_ALEMBIC_LIB', 'Alembic library', ''),
+        ('BF_ALEMBIC_LIB_STATIC', 'Alembic static libraries', ''),
         ('BF_ALEMBIC_LIBPATH', 'Alembic library path', ''),
     ) # end of opts.AddOptions()
 
diff --git a/source/blender/pointcache/alembic/SConscript b/source/blender/pointcache/alembic/SConscript
index ca4dfb7..3f2b182 100644
--- a/source/blender/pointcache/alembic/SConscript
+++ b/source/blender/pointcache/alembic/SConscript
@@ -39,9 +39,10 @@ incs = [
     '../../makesdna',
     '../../makesrna',
     '../../../../intern/guardedalloc',
-    '/opt/lib/openexr/include/OpenEXR',
     ]
 
+incs += Split(env['BF_OPENEXR_INC'])
+
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
diff --git a/source/blender/pointcache/alembic/abc_writer.cpp b/source/blender/pointcache/alembic/abc_writer.cpp
index 438918c..80632d3 100644
--- a/source/blender/pointcache/alembic/abc_writer.cpp
+++ b/source/blender/pointcache/alembic/abc_writer.cpp
@@ -17,7 +17,6 @@
  */
 
 //#include <Alembic/AbcCoreHDF5/ReadWrite.h>
-#include <Alembic/AbcCoreHDF5/ReadWrite.h>
 #include <Alembic/AbcCoreOgawa/ReadWrite.h>
 
 #include "abc_writer.h"