Commit: 48214e2357192905d910d07309ab8c653bc4cf02 Author: Ray Molenkamp Date: Wed Nov 2 15:13:01 2022 -0600 Branches: tmp-vfx-platform-2023 https://developer.blender.org/rB48214e2357192905d910d07309ab8c653bc4cf02
deps: openvdb 10.0.0 =================================================================== M build_files/build_environment/cmake/versions.cmake M build_files/build_environment/patches/openvdb.diff =================================================================== diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index ca3e4bdd489..1bc11f3a899 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -218,9 +218,9 @@ set(TBB_HASH_TYPE MD5) set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz) set(TBB_CPE "cpe:2.3:a:intel:threading_building_blocks:${TBB_YEAR}:*:*:*:*:*:*:*") -set(OPENVDB_VERSION 9.1.0) +set(OPENVDB_VERSION 10.0.0) set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz) -set(OPENVDB_HASH 8918de645a737734e577e16753325703) +set(OPENVDB_HASH 64301c737e16b26c8f3085a31e6397e9) set(OPENVDB_HASH_TYPE MD5) set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz) diff --git a/build_files/build_environment/patches/openvdb.diff b/build_files/build_environment/patches/openvdb.diff index 9ad231e0c6d..b231b54afb4 100644 --- a/build_files/build_environment/patches/openvdb.diff +++ b/build_files/build_environment/patches/openvdb.diff @@ -75,16 +75,3 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/v + + END +END -diff -Naur orig/openvdb_ax/openvdb_ax/CMakeLists.txt openvdb/openvdb_ax/openvdb_ax/CMakeLists.txt ---- orig/openvdb_ax/openvdb_ax/CMakeLists.txt 2022-06-09 08:50:40 -0600 -+++ openvdb/openvdb_ax/openvdb_ax/CMakeLists.txt 2022-08-08 22:11:02 -0600 -@@ -305,6 +305,9 @@ - # Configure shared build - - if(OPENVDB_AX_SHARED) -+ if(WIN32) -+ list(APPEND OPENVDB_AX_PUBLIC_DEFINES -DOPENVDB_AX_DLL) -+ endif() - target_compile_definitions(openvdb_ax_shared PUBLIC ${OPENVDB_AX_PUBLIC_DEFINES}) - target_compile_definitions(openvdb_ax_shared PRIVATE ${OPENVDB_AX_PRIVATE_DEFINES}) - target_compile_options(openvdb_ax_shared PUBLIC ${OPENVDB_AX_PUBLIC_OPTIONS}) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs