From 0a3b076961443266ff9d24fd6bbe302f71a85c4b Mon Sep 17 00:00:00 2001 From: Ray molenkamp Date: Tue, 9 Feb 2021 14:13:07 +0000 Subject: CMake/Deps: OpenVDB 8.0.1 Straight forward version bump, some of the variables to detect a static OpenEXR changed and the folder structure seemingly changed a little requiring updates to the diff Reviewed By: sebbas, sybren Differential Revision: https://developer.blender.org/D10340 --- build_files/build_environment/cmake/openvdb.cmake | 2 ++ build_files/build_environment/cmake/versions.cmake | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'build_files/build_environment/cmake') diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 2962f085e1b..704a8269c22 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -54,6 +54,8 @@ set(OPENVDB_EXTRA_ARGS -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} -DOPENVDB_BUILD_BINARIES=Off -DCMAKE_DEBUG_POSTFIX=_d + -DILMBASE_USE_STATIC_LIBS=On + -DOPENEXR_USE_STATIC_LIBS=On ) if(WIN32) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 87c00e517db..c04a815b09b 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -148,9 +148,9 @@ set(TBB_VERSION 2020_U2) set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz) set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc) -set(OPENVDB_VERSION 7.0.0) +set(OPENVDB_VERSION 8.0.1) set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz) -set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8) +set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461) set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f) set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz) -- cgit v1.2.3