diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:48:47 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:48:47 +0300 |
| commit | 90e9da423b5f63d9845580e5b972138743a31c37 (patch) | |
| tree | 31d46e3b45b74757195e24620ae65658cf8251bc | |
| parent | d3fa1bd4d5a8ec82ffa41b996d7169711ee5831d (diff) | |
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.
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 2b7ef82b8ab..eb80d9513ef 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 e2d69112d3d..d708f1ccecf 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) |