CMake: Enable BLOSC for OpenVDB for the full config
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 23 Feb 2016 08:48:47 +0000 (09:48 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 23 Feb 2016 08:48:47 +0000 (09:48 +0100)
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.

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

index 2b7ef82b8abe045656db850d1ef2c298784764f0..eb80d9513ef162f68cb0da78c3f430e0fa94355d 100644 (file)
@@ -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
index e2d69112d3d39ac58e643e0f853408bc18b19deb..d708f1ccecfbdd2aa73fe9566cb49c807a8a75a4 100644 (file)
@@ -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)