[Bf-blender-cvs] [6419729] temp-openvdb: Make OpenVDB depend on Boost, also list headers in source

Campbell Barton noreply at git.blender.org
Sat Jan 23 06:39:44 CET 2016


Commit: 6419729133ccd5a4c551b34ec30a71f778a169bc
Author: Campbell Barton
Date:   Sat Jan 23 16:32:09 2016 +1100
Branches: temp-openvdb
https://developer.blender.org/rB6419729133ccd5a4c551b34ec30a71f778a169bc

Make OpenVDB depend on Boost, also list headers in source

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

M	CMakeLists.txt
M	intern/openvdb/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2982f03..a03fbf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -680,10 +680,11 @@ if(NOT WITH_BOOST)
 	set_and_warn(WITH_CYCLES         OFF)
 	set_and_warn(WITH_AUDASPACE      OFF)
 	set_and_warn(WITH_INTERNATIONAL  OFF)
+	set_and_warn(WITH_OPENVDB        OFF)
 
 	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
 	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
-elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR WITH_OPENVDB)
 	# Keep enabled
 else()
 	# Enabled but we don't need it
diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
index 37264fa..76c8d1e 100644
--- a/intern/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -52,6 +52,11 @@ if(WITH_OPENVDB)
 		intern/openvdb_writer.cc
 		openvdb_capi.cc
 		openvdb_util.cc
+
+		intern/openvdb_dense_convert.h
+		intern/openvdb_reader.h
+		intern/openvdb_writer.h
+		openvdb_util.h
 	)
 endif()




More information about the Bf-blender-cvs mailing list