[Bf-blender-cvs] [90e9da4] master: CMake: Enable BLOSC for OpenVDB for the full config

[Sergey Sharybin]

Commit: 90e9da423b5f63d9845580e5b972138743a31c37
Author: Sergey Sharybin
Date:   Tue Feb 23 09:48:47 2016 +0100
Branches: master
https://developer.blender.org/rB90e9da423b5f63d9845580e5b972138743a31c37

CMake: Enable BLOSC for OpenVDB for the full config

This will respect the official build configuration where we should
have BLOSC enabled.

We can't really detect if OpenVDB was compiled with BLOSC or not,
so seems we can't really avoid this extra flag.

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

M	build_files/buildbot/config/blender_linux.cmake
M	build_files/cmake/config/blender_full.cmake

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

diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 2b7ef82..eb80d95 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -102,8 +102,6 @@ set(TIFF_LIBRARY        "/usr/lib/libtiff.a"  CACHE STRING "" FORCE)
 set(ZLIB_LIBRARY        "/usr/lib/libz.a"     CACHE STRING "" FORCE)
 
 # OpenVDB
-set(WITH_OPENVDB       ON  CACHE BOOL "" FORCE)
-set(WITH_OPENVDB_BLOSC ON  CACHE BOOL "" FORCE)
 set(OPENVDB_LIBRARY
 	/opt/lib/openvdb/lib/libopenvdb.a
 	/opt/lib/blosc/lib/libblosc.a
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index e2d6911..d708f1c 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -43,6 +43,7 @@ set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
+set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
 set(WITH_RAYOPTIMIZATION     ON  CACHE BOOL "" FORCE)
 set(WITH_SDL                 ON  CACHE BOOL "" FORCE)