Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 23 additions & 38 deletions ports/openvdb/0003-fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2e8c2a..749e12c 100644
index 93a65c7..24ec864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,14 +353,10 @@ endif()
@@ -338,13 +338,9 @@ endif()

if(OPENVDB_INSTALL_CMAKE_MODULES)
set(OPENVDB_CMAKE_MODULES
- cmake/FindBlosc.cmake
cmake/FindCppUnit.cmake
cmake/FindJemalloc.cmake
- cmake/FindIlmBase.cmake
cmake/FindLog4cplus.cmake
Expand All @@ -18,22 +17,10 @@ index f2e8c2a..749e12c 100644
cmake/OpenVDBHoudiniSetup.cmake
cmake/OpenVDBMayaSetup.cmake
diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
index b065192..7549843 100644
index 219b90a..b280f85 100644
--- a/cmake/FindOpenVDB.cmake
+++ b/cmake/FindOpenVDB.cmake
@@ -224,8 +224,9 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS})
${OPENVDB_${COMPONENT}_ROOT}
${OPENVDB_${COMPONENT}_INCLUDEDIR}
)
- list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS)
-
+ if(_VDB_COMPONENT_SEARCH_DIRS)
+ list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS)
+ endif()
# Look for a standard header files.
if(${COMPONENT} STREQUAL "openvdb")
# Look for a standard OpenVDB header file.
@@ -429,8 +430,8 @@ endif()
@@ -448,8 +448,8 @@ endif()

# Add standard dependencies

Expand All @@ -44,39 +31,37 @@ index b065192..7549843 100644
find_package(ZLIB REQUIRED)

if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
@@ -540,7 +541,7 @@ if(NOT OPENVDB_USE_STATIC_LIBS)
@@ -588,7 +588,7 @@ else()
endif()

if(OpenVDB_USES_BLOSC)
- find_package(Blosc REQUIRED)
+ find_package(blosc CONFIG REQUIRED)
endif()

if(OpenVDB_USES_LOG4CPLUS)
@@ -548,8 +549,8 @@ if(OpenVDB_USES_LOG4CPLUS)
endif()

if(OpenVDB_USES_ZLIB)
@@ -602,6 +602,8 @@ endif()
if(OpenVDB_USES_EXR)
- find_package(IlmBase REQUIRED)
- find_package(OpenEXR REQUIRED)
find_package(IlmBase REQUIRED)
find_package(OpenEXR REQUIRED)
+ find_package(IlmBase CONFIG REQUIRED)
+ find_package(OpenEXR CONFIG REQUIRED)
endif()

if(UNIX)
@@ -610,7 +611,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
@@ -662,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)

if(NOT OPENVDB_USE_STATIC_LIBS)
if(OpenVDB_USES_BLOSC)
- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc)
+ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc)
endif()

list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
index 45b302c..d75cfd1 100644
--- a/openvdb/CMakeLists.txt
+++ b/openvdb/CMakeLists.txt
if(OpenVDB_USES_ZLIB)
list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
index 536bf1e..568fec1 100644
--- a/openvdb/openvdb/CMakeLists.txt
+++ b/openvdb/openvdb/CMakeLists.txt
@@ -47,7 +47,7 @@ message(STATUS "----------------------------------------------------")
##########################################################################

Expand Down Expand Up @@ -111,7 +96,7 @@ index 45b302c..d75cfd1 100644

if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
@@ -84,14 +90,7 @@ if(USE_LOG4CPLUS)
@@ -82,14 +88,7 @@ if(USE_LOG4CPLUS)
endif()

if(USE_BLOSC)
Expand All @@ -127,19 +112,19 @@ index 45b302c..d75cfd1 100644
else()
message(WARNING "Blosc support is disabled. It is strongly recommended to "
"enable blosc for optimal builds of OpenVDB and to support compatible "
@@ -163,7 +162,7 @@ endif()
@@ -165,7 +164,7 @@ endif()
# See FindOpenVDB.cmake

if(USE_BLOSC)
- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc)
endif()

list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt
index 2b831bb..a13b63b 100644
--- a/openvdb/cmd/CMakeLists.txt
+++ b/openvdb/cmd/CMakeLists.txt
if(USE_BLOSC OR USE_ZLIB)
diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt
index ba78f4b..461fd2f 100644
--- a/openvdb/openvdb/cmd/CMakeLists.txt
+++ b/openvdb/openvdb/cmd/CMakeLists.txt
@@ -50,7 +50,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
find_package(Jemalloc REQUIRED)
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc)
Expand Down
10 changes: 0 additions & 10 deletions ports/openvdb/CONTROL

This file was deleted.

24 changes: 16 additions & 8 deletions ports/openvdb/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AcademySoftwareFoundation/openvdb
REF 2a7966ccb184092a49355c04bccb014d84956ff7 # v7.1.0
SHA512 6d3d2481fd116c5fd8fdf84a5139cd6e6986e188c3a5def05ec3bee47bd31bee3099a1d317a330b10c2cf93094f305eeeea02cadcabfc81f8ffc60bf8acdb84e
REF 587c9ae84c2822bbc03d0d7eceb52898582841b9 # v8.0.0
SHA512 4abc442a86dd0614492edf70e887886b755102f04d44eebd1a154df24e05e53a80de8e9b47b370946bcc3888ab7a94ae331a3addac8d784e25ae5da7523afca9
HEAD_REF master
PATCHES
0003-fix-cmake.patch
Expand All @@ -25,9 +25,16 @@ if ("tools" IN_LIST FEATURES)
endif()
endif()

vcpkg_configure_cmake(
if ("ax" IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_WINDOWS)
set(OPENVDB_BUILD_AX ON)
else()
message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.")
endif()
endif()

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DOPENVDB_BUILD_UNITTESTS=OFF
-DOPENVDB_BUILD_PYTHON_MODULE=OFF
Expand All @@ -40,11 +47,12 @@ vcpkg_configure_cmake(
-DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS}
-DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS}
-DUSE_PKGCONFIG=OFF
${OPENVDB_BUILD_AX}
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenVDB TARGET_PATH share/openvdb)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB)

vcpkg_copy_pdbs()

Expand All @@ -55,5 +63,5 @@ if (OPENVDB_BUILD_TOOLS)
endif()

configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
40 changes: 40 additions & 0 deletions ports/openvdb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "openvdb",
"version": "8.0.0",
"description": "Sparse volume data structure and tools",
"homepage": "https://github.com/dreamworksanimation/openvdb",
"dependencies": [
"blosc",
"boost-any",
"boost-date-time",
"boost-interprocess",
"boost-iostreams",
"boost-ptr-container",
"boost-system",
"boost-thread",
"boost-uuid",
"ilmbase",
"openexr",
"tbb",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"ax": {
"description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data."
},
"tools": {
"description": "OpenVDB utilities: view, print and render",
"dependencies": [
"glew",
"glfw3"
]
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4645,8 +4645,8 @@
"port-version": 1
},
"openvdb": {
"baseline": "7.1.0",
"port-version": 2
"baseline": "8.0.0",
"port-version": 0
},
"openvpn3": {
"baseline": "3.4.1-1",
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": "5dd93bca4d648b1e0ab01d3cf4df79a183944688",
"version": "8.0.0",
"port-version": 0
},
{
"git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31",
"version-string": "7.1.0",
Expand Down