From 604c33e694375828b0f322010e8e4ac17b4b02f3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 19 Apr 2022 18:09:05 +0200 Subject: Build: updates for Blender to build against new 3.2 libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building against the existing 3.1 libraries should continue to work, until the precompiled libraries are committed for all platforms. * Enable WebP by default. * Update Windows for new library file names. * Automatically clear outdated CMake cache variables when upgrading to new libraries. * Fix static library linking order issues on Linux for OpenEXR and OpenVDB. Implemented by Ray Molenkamp, Sybren Stüvel and Brecht Van Lommel. Ref T95206 --- extern/mantaflow/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'extern') diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt index c9e2b54ef18..908c5d2ffd9 100644 --- a/extern/mantaflow/CMakeLists.txt +++ b/extern/mantaflow/CMakeLists.txt @@ -259,3 +259,10 @@ set(LIB ) blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") + +# The VDB libs above are only added to as INTERFACE libs by blender_add_lib, +# meaning extern_mantaflow itself actually does not have a dependency on the +# openvdb libraries, and CMAKE is free to link the vdb libs before +# extern_mantaflow causing linker errors on linux. By explicitly declaring +# a dependency here, cmake will do the right thing. +target_link_libraries(extern_mantaflow PRIVATE ${OPENVDB_LIBRARIES}) -- cgit v1.2.3