Skip to content

Commit

Permalink
[openvdb] update to 8.2.0 (#22184)
Browse files Browse the repository at this point in the history
* update openvdb to 8.2.0

* merge fix-case-sensitive.patch to 0003-fix-cmake.patch

* update

* Add double quotes for the path
  • Loading branch information
Adela0814 committed Dec 28, 2021
1 parent 432ca4a commit bb57cc6
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 48 deletions.
79 changes: 41 additions & 38 deletions ports/openvdb/0003-fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3456346..f7e5796 100644
index 2a879f2..e0d9ab5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,13 +354,9 @@ endif()
@@ -356,13 +356,9 @@ endif()

if(OPENVDB_INSTALL_CMAKE_MODULES)
set(OPENVDB_CMAKE_MODULES
Expand All @@ -17,10 +17,10 @@ index 3456346..f7e5796 100644
cmake/OpenVDBHoudiniSetup.cmake
cmake/OpenVDBMayaSetup.cmake
diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
index 1dc5bc0..d84d8f1 100644
index 86eaf84..15fe31a 100644
--- a/cmake/FindOpenVDB.cmake
+++ b/cmake/FindOpenVDB.cmake
@@ -457,7 +457,7 @@ endif()
@@ -462,7 +462,7 @@ endif()

# Add standard dependencies

Expand All @@ -29,7 +29,7 @@ index 1dc5bc0..d84d8f1 100644

if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
# @note Both of these must be set for Boost 1.70 (VFX2020) to link against
@@ -607,7 +607,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
@@ -612,7 +612,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
endif()

if(OpenVDB_USES_BLOSC)
Expand All @@ -38,16 +38,16 @@ index 1dc5bc0..d84d8f1 100644
endif()

if(OpenVDB_USES_ZLIB)
@@ -619,7 +619,7 @@ if(OpenVDB_USES_LOG4CPLUS)
endif()

@@ -626,7 +626,7 @@ endif()
if(OpenVDB_USES_IMATH_HALF)
- find_package(IlmBase REQUIRED COMPONENTS Half)
+ find_package(IlmBase CONFIG REQUIRED)
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
- find_package(IlmBase REQUIRED COMPONENTS Half)
+ find_package(IlmBase CONFIG REQUIRED)
endif()

if(WIN32)
# @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed
if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY))
@@ -664,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
@@ -675,7 +675,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)

if(NOT OPENVDB_USE_STATIC_LIBS)
if(OpenVDB_USES_BLOSC)
Expand All @@ -57,28 +57,31 @@ index 1dc5bc0..d84d8f1 100644
if(OpenVDB_USES_ZLIB)
list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
index 88543df..92efaee 100644
index 9b6ba83..08b6bb3 100644
--- a/openvdb/openvdb/CMakeLists.txt
+++ b/openvdb/openvdb/CMakeLists.txt
@@ -120,7 +120,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
@@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
endif()
endif()

-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
+find_package(TBB CONFIG REQUIRED)
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
- if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
+ if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
@@ -129,7 +129,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
endif()
"is deprecated and will be removed.")
endif()
@@ -138,7 +138,7 @@ endif()
if(USE_IMATH_HALF)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
+ find_package(IlmBase CONFIG REQUIRED)
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
@@ -145,14 +145,7 @@ endif()
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
+ find_package(IlmBase CONFIG REQUIRED)
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
@@ -157,14 +157,7 @@ endif()

if(USE_BLOSC)
# Find Blosc libraries
Expand All @@ -94,8 +97,8 @@ index 88543df..92efaee 100644
else()
message(WARNING "Blosc support is disabled. It is strongly recommended to "
"enable blosc for optimal builds of OpenVDB and to support compatible "
@@ -215,7 +208,7 @@ endif()
# See FindOpenVDB.cmake
@@ -222,7 +215,7 @@ endif()
# /usr/local

if(USE_BLOSC)
- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
Expand All @@ -104,7 +107,7 @@ index 88543df..92efaee 100644

if(USE_BLOSC OR USE_ZLIB)
diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt
index 8d9c375..14e1296 100644
index 4d96425..d2037e8 100644
--- a/openvdb/openvdb/cmd/CMakeLists.txt
+++ b/openvdb/openvdb/cmd/CMakeLists.txt
@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
Expand All @@ -116,14 +119,14 @@ index 8d9c375..14e1296 100644
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
endif()

@@ -116,8 +116,8 @@ endif()
#### vdb_render

@@ -83,8 +83,8 @@ endif()
if(OPENVDB_BUILD_VDB_RENDER)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
+ find_package(IlmBase CONFIG REQUIRED)
+ find_package(OpenEXR CONFIG REQUIRED)

set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
+ find_package(IlmBase CONFIG REQUIRED)
+ find_package(OpenEXR CONFIG REQUIRED)
else()
find_package(OpenEXR CONFIG)
endif()
15 changes: 7 additions & 8 deletions ports/openvdb/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AcademySoftwareFoundation/openvdb
REF ea786c46b7a1b5158789293d9b148b379fc9914c # v8.1.0
SHA512 3c4ab3db35b3eb019149ac455f0c7a262081e9866b7e49eaba05424bf837debccf0c987c2555d3c91a2cff2d1ba4b41862f544fd4684558f3a319616ef3c9eb3
HEAD_REF master
REF 89873d2bd29870cc9f176ed12b3f3a930ca38d1a # v8.2.0
SHA512 d72a0eec6b7ce8e25fbe3100d4a291c35d7c2448f23131aaa9f247210f26e965198ef2991d9cf789afc754cbcddaace7a27ab62a2609a19a896034859c518699
PATCHES
0003-fix-cmake.patch
)

file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindIlmBase.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindBlosc.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindOpenEXR.cmake)
file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/FindIlmBase.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/FindBlosc.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/FindOpenEXR.cmake")

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENVDB_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENVDB_SHARED)
Expand All @@ -34,7 +33,7 @@ if ("ax" IN_LIST FEATURES)
endif()

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DOPENVDB_BUILD_UNITTESTS=OFF
-DOPENVDB_BUILD_PYTHON_MODULE=OFF
Expand Down
2 changes: 1 addition & 1 deletion ports/openvdb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openvdb",
"version": "8.1.0",
"version": "8.2.0",
"description": "Sparse volume data structure and tools",
"homepage": "https://github.com/dreamworksanimation/openvdb",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5053,7 +5053,7 @@
"port-version": 1
},
"openvdb": {
"baseline": "8.1.0",
"baseline": "8.2.0",
"port-version": 0
},
"openvpn3": {
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openvdb.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8546c4c4d392f4b0bb9a604e8bb6a831d39b99e8",
"version": "8.2.0",
"port-version": 0
},
{
"git-tree": "ecd4c1d0e5c1e497615d75cb0748c97fa1d70384",
"version": "8.1.0",
Expand Down

0 comments on commit bb57cc6

Please sign in to comment.