[Bf-blender-cvs] [9085b7e847b] master: Fix OpenVDB link error on Windows after recent changes

[Brecht Van Lommel]

Commit: 9085b7e847bb8904e17597d651f1a8f4c7e9ae43
Author: Brecht Van Lommel
Date:   Wed Feb 26 19:10:07 2020 +0100
Branches: master
https://developer.blender.org/rB9085b7e847bb8904e17597d651f1a8f4c7e9ae43

Fix OpenVDB link error on Windows after recent changes

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

M	extern/mantaflow/CMakeLists.txt
M	intern/mantaflow/CMakeLists.txt

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

diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt
index 95d46ae5a9b..bdee06349d2 100644
--- a/extern/mantaflow/CMakeLists.txt
+++ b/extern/mantaflow/CMakeLists.txt
@@ -49,6 +49,11 @@ if(WITH_TBB)
   add_definitions(-DTBB=1)
 endif()
 
+if(WITH_OPENVDB)
+  add_definitions(-DOPENVDB=1)
+  add_definitions(-DOPENVDB_STATICLIB)
+endif()
+
 if(WIN32)
   add_definitions(-D_USE_MATH_DEFINES)
 endif()
@@ -78,7 +83,6 @@ if(WITH_TBB)
 endif()
 
 if(WITH_OPENVDB)
-  add_definitions(-DOPENVDB=1 ${OPENVDB_DEFINITIONS})
   list(APPEND INC_SYS
     ${OPENVDB_INCLUDE_DIRS}
   )
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index 1ca523ccc44..5080f2d8cac 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -64,6 +64,7 @@ if(WITH_TBB)
 endif()
 
 if(WITH_OPENVDB)
+  add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
   list(APPEND INC_SYS
     ${OPENVDB_INCLUDE_DIRS}
   )