[Bf-blender-cvs] [78391def6e4] master: Cleanup: deduplicate OpenVDB library definitions/include/libs logic

[Brecht Van Lommel]

Commit: 78391def6e41f994e9089b346332c909b9ccc58a
Author: Brecht Van Lommel
Date:   Wed Feb 26 15:11:24 2020 +0100
Branches: master
https://developer.blender.org/rB78391def6e41f994e9089b346332c909b9ccc58a

Cleanup: deduplicate OpenVDB library definitions/include/libs logic

This will more important when we start using OpenVDB in more modules.

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

M	CMakeLists.txt
M	build_files/cmake/platform/platform_win32.cmake
M	extern/mantaflow/CMakeLists.txt
M	intern/mantaflow/CMakeLists.txt
M	intern/openvdb/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c6a5de4aa7..0116446454e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -899,6 +899,28 @@ if(NOT WITH_SYSTEM_EIGEN3)
   set(EIGEN3_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/Eigen3)
 endif()
 
+if(WITH_OPENVDB)
+  list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB)
+
+  if(WITH_OPENVDB_3_ABI_COMPATIBLE)
+    list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE)
+  endif()
+
+  list(APPEND OPENVDB_INCLUDE_DIRS
+    ${BOOST_INCLUDE_DIR}
+    ${TBB_INCLUDE_DIRS}
+    ${OPENEXR_INCLUDE_DIRS})
+
+  list(APPEND OPENVDB_LIBRARIES ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
+
+  if(WITH_OPENVDB_BLOSC)
+    list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB_BLOSC)
+    list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES} ${ZLIB_LIBRARIES})
+  endif()
+
+  list(APPEND OPENVDB_LIBRARIES ${BOOST_LIBRARIES} ${TBB_LIBRARIES})
+endif()
+
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 0c1374af348..c3d00d25425 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -504,7 +504,7 @@ if(WITH_OPENVDB)
   set(OPENVDB_LIBPATH ${OPENVDB}/lib)
   set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
   set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${BLOSC_LIBRARIES})
-  set(OPENVDB_DEFINITIONS -DNOMINMAX)
+  set(OPENVDB_DEFINITIONS -DNOMINMAX -DOPENVDB_STATICLIB -D_USE_MATH_DEFINES)
 endif()
 
 if(WITH_OPENIMAGEDENOISE)
diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt
index 7486f123666..95d46ae5a9b 100644
--- a/extern/mantaflow/CMakeLists.txt
+++ b/extern/mantaflow/CMakeLists.txt
@@ -49,11 +49,6 @@ 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()
@@ -83,23 +78,13 @@ if(WITH_TBB)
 endif()
 
 if(WITH_OPENVDB)
+  add_definitions(-DOPENVDB=1 ${OPENVDB_DEFINITIONS})
   list(APPEND INC_SYS
-    ${BOOST_INCLUDE_DIR}
-    ${OPENEXR_INCLUDE_DIRS}
     ${OPENVDB_INCLUDE_DIRS}
   )
   list(APPEND LIB
     ${OPENVDB_LIBRARIES}
-    ${OPENEXR_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-    ${BOOST_LIBRARIES}
   )
-  if(WITH_OPENVDB_BLOSC)
-    list(APPEND LIB
-      ${BLOSC_LIBRARIES}
-      ${ZLIB_LIBRARIES}
-    )
-  endif()
 endif()
 
 set(SRC
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index d9b64b3a199..1ca523ccc44 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -27,7 +27,6 @@ add_definitions(-DWITH_FLUID=1)
 
 if(WITH_OPENVDB)
   add_definitions(-DOPENVDB=1)
-  add_definitions(-DOPENVDB_STATICLIB)
 else()
   add_definitions(-DOPENVDB=0)
 endif()
@@ -66,22 +65,11 @@ endif()
 
 if(WITH_OPENVDB)
   list(APPEND INC_SYS
-    ${BOOST_INCLUDE_DIR}
-    ${OPENEXR_INCLUDE_DIRS}
     ${OPENVDB_INCLUDE_DIRS}
   )
   list(APPEND LIB
     ${OPENVDB_LIBRARIES}
-    ${OPENEXR_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-    ${BOOST_LIBRARIES}
   )
-  if(WITH_OPENVDB_BLOSC)
-    list(APPEND LIB
-      ${BLOSC_LIBRARIES}
-      ${ZLIB_LIBRARIES}
-    )
-  endif()
 endif()
 
 set(SRC
diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
index a681d723b9c..2b7517a255c 100644
--- a/intern/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -35,28 +35,9 @@ set(LIB
 )
 
 if(WITH_OPENVDB)
-  add_definitions(
-    -DWITH_OPENVDB
-    ${OPENVDB_DEFINITIONS}
-  )
-
-  if(WIN32)
-    add_definitions(
-      -DOPENVDB_STATICLIB
-      -D_USE_MATH_DEFINES
-    )
-  endif()
-
-  if(WITH_OPENVDB_3_ABI_COMPATIBLE)
-    add_definitions(
-      -DOPENVDB_3_ABI_COMPATIBLE
-    )
-  endif()
+  add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
 
   list(APPEND INC_SYS
-    ${BOOST_INCLUDE_DIR}
-    ${TBB_INCLUDE_DIRS}
-    ${OPENEXR_INCLUDE_DIRS}
     ${OPENVDB_INCLUDE_DIRS}
   )
 
@@ -79,23 +60,6 @@ if(WITH_OPENVDB)
 
   list(APPEND LIB
     ${OPENVDB_LIBRARIES}
-    ${OPENEXR_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-  )
-
-  if(WITH_OPENVDB_BLOSC)
-    add_definitions(
-      -DWITH_OPENVDB_BLOSC
-    )
-    list(APPEND LIB
-      ${BLOSC_LIBRARIES}
-      ${ZLIB_LIBRARIES}
-    )
-  endif()
-
-  list(APPEND LIB
-    ${BOOST_LIBRARIES}
-    ${TBB_LIBRARIES}
   )
 endif()