[Bf-blender-cvs] [1832cfd5875] new-object-types: Merge branch 'master' into new-object-types

[Brecht Van Lommel]

Commit: 1832cfd58759b79176fd7aafdbcc7ff3b7dcab34
Author: Brecht Van Lommel
Date:   Wed Feb 26 18:16:49 2020 +0100
Branches: new-object-types
https://developer.blender.org/rB1832cfd58759b79176fd7aafdbcc7ff3b7dcab34

Merge branch 'master' into new-object-types

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 582050bbfc8,f536b8d94fc..aceaad4c90d
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -632,41 -625,16 +632,14 @@@ if(WITH_OPENVDB
    list(APPEND INC
       ../../../intern/openvdb
    )
 +  list(APPEND INC_SYS
-     ${BOOST_INCLUDE_DIR}
-     ${TBB_INCLUDE_DIRS}
-     ${OPENEXR_INCLUDE_DIRS}
 +    ${OPENVDB_INCLUDE_DIRS}
 +  )
    list(APPEND LIB
 -     bf_intern_openvdb
 +    bf_intern_openvdb
 +    ${OPENVDB_LIBRARIES}
-     ${OPENEXR_LIBRARIES}
-     ${BLOSC_LIBRARIES}
-     ${ZLIB_LIBRARIES}
-     ${BOOST_LIBRARIES}
-     ${TBB_LIBRARIES}
    )
- 
--  add_definitions(-DWITH_OPENVDB)
--
--  if(WITH_OPENVDB_BLOSC)
--    add_definitions(
--      -DWITH_OPENVDB_BLOSC
-     )
-   endif()
- 
-   if(WIN32)
-     add_definitions(
-       -DOPENVDB_STATICLIB
-     )
-   endif()
- 
-   if(WITH_OPENVDB_3_ABI_COMPATIBLE)
-     add_definitions(
-       -DOPENVDB_3_ABI_COMPATIBLE
--    )
--  endif()
++  add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
  endif()
  
  if(WITH_QUADRIFLOW)