From 9085b7e847bb8904e17597d651f1a8f4c7e9ae43 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 26 Feb 2020 19:10:07 +0100 Subject: Fix OpenVDB link error on Windows after recent changes --- extern/mantaflow/CMakeLists.txt | 6 +++++- intern/mantaflow/CMakeLists.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) 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} ) -- cgit v1.2.3