[Bf-blender-cvs] [7e03c74] openvdb: Add OPENVDB_USE_BLOSC definition.

[Kévin Dietrich]

Commit: 7e03c74c53306746f8cf728c8ec9467044f04194
Author: Kévin Dietrich
Date:   Thu May 28 14:40:35 2015 +0200
Branches: openvdb
https://developer.blender.org/rB7e03c74c53306746f8cf728c8ec9467044f04194

Add OPENVDB_USE_BLOSC definition.

Due to a bug in OpenVDB we have to set this. Though this is fixed in the
current development version, and once the next stable release is out
those defines will be removed.

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

M	CMakeLists.txt
M	intern/cycles/CMakeLists.txt
M	intern/openvdb/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt
M	source/blender/python/intern/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bf0555..cca6068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1509,6 +1509,7 @@ elseif(WIN32)
 			set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES})
 			set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
 			set(OPENVDB_DEFINITIONS)
+			add_definitions(-DOPENVDB_USE_BLOSC)
 		endif()
 
 		if(WITH_MOD_CLOTH_ELTOPO)
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index ef0f624..b02dafc 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -148,6 +148,7 @@ endif()
 
 if(WITH_OPENVDB)
 	add_definitions(-DWITH_OPENVDB)
+	add_definitions(-DOPENVDB_USE_BLOSC)
 	include_directories(
 		${OPENVDB_INCLUDE_DIRS}
 	)
diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
index 06d7c3b..3f38574 100644
--- a/intern/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -44,6 +44,7 @@ set(SRC
 if(WITH_OPENVDB)
 	add_definitions(
 		-DWITH_OPENVDB
+		-DOPENVDB_USE_BLOSC
 	)
 
 	list(APPEND INC_SYS
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 5b9bfd1..59a2c72 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -481,6 +481,7 @@ endif()
 
 if(WITH_OPENVDB)
 	add_definitions(-DWITH_OPENVDB)
+	add_definitions(-DOPENVDB_USE_BLOSC)
 endif()
 
 ## Warnings as errors, this is too strict!
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index c1cd19d..fd247e3 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -291,6 +291,7 @@ endif()
 
 if(WITH_OPENVDB)
 	add_definitions(-DWITH_OPENVDB)
+	add_definitions(-DOPENVDB_USE_BLOSC)
 endif()
 
 blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 796bf15..1a3e92c 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -268,6 +268,7 @@ endif()
 
 if(WITH_OPENVDB)
     add_definitions(-DWITH_OPENVDB)
+	add_definitions(-DOPENVDB_USE_BLOSC)
     list(APPEND INC
         ../../../../intern/openvdb
     )