Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-02-26 17:11:24 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-02-26 20:13:14 +0300
commit78391def6e41f994e9089b346332c909b9ccc58a (patch)
tree215e930cef52539bb845051c90059f40f24545ba /extern
parent22abc7f0808835d88ea244a1129ae4e98d87dc3b (diff)
Cleanup: deduplicate OpenVDB library definitions/include/libs logic
This will more important when we start using OpenVDB in more modules.
Diffstat (limited to 'extern')
-rw-r--r--extern/mantaflow/CMakeLists.txt17
1 files changed, 1 insertions, 16 deletions
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