diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-08-13 20:42:05 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-08-13 20:42:05 +0300 |
| commit | e691a3a9b7f3d7a57eb0a65a6fa8dde46aff523b (patch) | |
| tree | 8a7838df24df264240e16aa70a069297992634cf /build_files/cmake | |
| parent | aabbb515d6cadd8f9ce9f1161a50fdf8c75b6dd1 (diff) | |
Deps_builder: Update openvdb to a dynamic library
This patch changes openvdb from a static to a dynamic library.
this is in preparation for enabling pyopenvdb at some point
in the future.
Differential Revision: https://developer.blender.org/D8282
Reviewed by: brecht
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index dfcd5d75444..b8af2dfc961 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -416,9 +416,6 @@ if(WITH_BOOST) if(WITH_INTERNATIONAL) list(APPEND boost_extra_libs locale) endif() - if(WITH_OPENVDB) - list(APPEND boost_extra_libs iostreams) - endif() set(Boost_USE_STATIC_RUNTIME ON) # prefix lib set(Boost_USE_MULTITHREADED ON) # suffix -mt set(Boost_USE_STATIC_LIBS ON) # suffix -s @@ -524,12 +521,11 @@ if(WITH_OPENCOLORIO) endif() if(WITH_OPENVDB) - set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib) set(OPENVDB ${LIBDIR}/openVDB) set(OPENVDB_LIBPATH ${OPENVDB}/lib) set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include) - set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${BLOSC_LIBRARIES}) - set(OPENVDB_DEFINITIONS -DNOMINMAX -DOPENVDB_STATICLIB -D_USE_MATH_DEFINES) + set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ) + set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES) endif() if(WITH_OPENIMAGEDENOISE) |