From 78391def6e41f994e9089b346332c909b9ccc58a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 26 Feb 2020 15:11:24 +0100 Subject: Cleanup: deduplicate OpenVDB library definitions/include/libs logic This will more important when we start using OpenVDB in more modules. --- extern/mantaflow/CMakeLists.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'extern') 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 -- cgit v1.2.3