diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-09-08 22:56:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 07:56:56 -0700 |
| commit | 277e9a7f4632029977626adc938a5a8bda675649 (patch) | |
| tree | f2b4cececd48aeabf383ca0317c78eb272539f4f /ports/openvdb | |
| parent | f4f8bba9d4429a030153e6fda2d8d6b262a54c8f (diff) | |
| download | vcpkg-277e9a7f4632029977626adc938a5a8bda675649.tar.gz vcpkg-277e9a7f4632029977626adc938a5a8bda675649.zip | |
[glew/openvdb/xtensor-io] Update to latest release version (#20022)
* [glew/openvdb/xtensor-io] Update to latest release version
* [glew] Update patch
* [xtensor-io] Update version
Diffstat (limited to 'ports/openvdb')
| -rw-r--r-- | ports/openvdb/0003-fix-cmake.patch | 276 | ||||
| -rw-r--r-- | ports/openvdb/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/openvdb/vcpkg.json | 2 |
3 files changed, 134 insertions, 152 deletions
diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index caaf4f256..5db8cdde9 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,147 +1,129 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93a65c7..24ec864 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -338,13 +338,9 @@ endif()
-
- if(OPENVDB_INSTALL_CMAKE_MODULES)
- set(OPENVDB_CMAKE_MODULES
-- cmake/FindBlosc.cmake
- cmake/FindJemalloc.cmake
-- cmake/FindIlmBase.cmake
- cmake/FindLog4cplus.cmake
-- cmake/FindOpenEXR.cmake
- cmake/FindOpenVDB.cmake
-- cmake/FindTBB.cmake
- cmake/OpenVDBGLFW3Setup.cmake
- cmake/OpenVDBHoudiniSetup.cmake
- cmake/OpenVDBMayaSetup.cmake
-diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
-index 219b90a..b280f85 100644
---- a/cmake/FindOpenVDB.cmake
-+++ b/cmake/FindOpenVDB.cmake
-@@ -448,8 +448,8 @@ endif()
-
- # Add standard dependencies
-
--find_package(IlmBase REQUIRED COMPONENTS Half)
--find_package(TBB REQUIRED COMPONENTS tbb)
-+find_package(IlmBase CONFIG REQUIRED)
-+find_package(TBB CONFIG REQUIRED)
- find_package(ZLIB REQUIRED)
-
- if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_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_ZLIB)
-@@ -602,6 +602,8 @@ endif()
- if(OpenVDB_USES_EXR)
- find_package(IlmBase REQUIRED)
- find_package(OpenEXR REQUIRED)
-+ find_package(IlmBase CONFIG REQUIRED)
-+ find_package(OpenEXR CONFIG REQUIRED)
- endif()
-
- if(UNIX)
-@@ -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()
- 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 "----------------------------------------------------")
- ##########################################################################
-
- # Collect and configure lib dependencies
--
-+if(0)
- if(USE_EXR)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED)
- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED)
-@@ -57,8 +57,14 @@ if(USE_EXR)
- "is deprecated and will be removed.")
- endif()
- endif()
-+endif()
-+endif()
-+
-+if(USE_EXR)
-+ find_package(IlmBase CONFIG REQUIRED)
-+ find_package(OpenEXR CONFIG REQUIRED)
- else()
-- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
-+ find_package(IlmBase CONFIG REQUIRED)
- endif()
-
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
-@@ -68,7 +74,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_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)
-@@ -82,14 +88,7 @@ if(USE_LOG4CPLUS)
- endif()
-
- if(USE_BLOSC)
-- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED)
-- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION)
-- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. "
-- "There have been reported issues with using later versions of Blosc with OpenVDB. "
-- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is "
-- "recommended that you use this version where possible."
-- )
-- endif()
-+ find_package(blosc CONFIG REQUIRED)
- else()
- message(WARNING "Blosc support is disabled. It is strongly recommended to "
- "enable blosc for optimal builds of OpenVDB and to support compatible "
-@@ -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()
-
- 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)
- elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
-- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc)
-+ find_package(TBB CONFIG REQUIRED)
- list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
- endif()
-
-@@ -120,8 +120,8 @@ endif()
- #### vdb_render
-
- 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})
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3456346..f7e5796 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -354,13 +354,9 @@ endif() + + if(OPENVDB_INSTALL_CMAKE_MODULES) + set(OPENVDB_CMAKE_MODULES +- cmake/FindBlosc.cmake + cmake/FindJemalloc.cmake +- cmake/FindIlmBase.cmake + cmake/FindLog4cplus.cmake +- cmake/FindOpenEXR.cmake + cmake/FindOpenVDB.cmake +- cmake/FindTBB.cmake + cmake/OpenVDBGLFW3Setup.cmake + cmake/OpenVDBHoudiniSetup.cmake + cmake/OpenVDBMayaSetup.cmake +diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake +index 1dc5bc0..d84d8f1 100644 +--- a/cmake/FindOpenVDB.cmake ++++ b/cmake/FindOpenVDB.cmake +@@ -457,7 +457,7 @@ endif() + + # Add standard dependencies + +-find_package(TBB REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + + 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) + endif() + + if(OpenVDB_USES_BLOSC) +- find_package(Blosc REQUIRED) ++ find_package(blosc CONFIG REQUIRED) + endif() + + if(OpenVDB_USES_ZLIB) +@@ -619,7 +619,7 @@ if(OpenVDB_USES_LOG4CPLUS) + endif() + + if(OpenVDB_USES_IMATH_HALF) +- find_package(IlmBase REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + 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) + + if(NOT OPENVDB_USE_STATIC_LIBS) + if(OpenVDB_USES_BLOSC) +- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) ++ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) + endif() + 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 +--- a/openvdb/openvdb/CMakeLists.txt ++++ b/openvdb/openvdb/CMakeLists.txt +@@ -120,7 +120,7 @@ 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) + message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " +@@ -129,7 +129,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) + 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() + + if(USE_BLOSC) + # Find Blosc libraries +- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) +- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) +- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " +- "There have been reported issues with using later versions of Blosc with OpenVDB. " +- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " +- "recommended that you use this version where possible." +- ) +- endif() ++ find_package(blosc CONFIG REQUIRED) + 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 + + if(USE_BLOSC) +- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) ++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) + endif() + + if(USE_BLOSC OR USE_ZLIB) +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index 8d9c375..14e1296 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") + find_package(Jemalloc REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) + elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) ++ find_package(TBB CONFIG REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) + endif() + +@@ -116,8 +116,8 @@ endif() + #### vdb_render + + 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}) diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 63867f9f4..116cbb34b 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF 587c9ae84c2822bbc03d0d7eceb52898582841b9 # v8.0.0 - SHA512 4abc442a86dd0614492edf70e887886b755102f04d44eebd1a154df24e05e53a80de8e9b47b370946bcc3888ab7a94ae331a3addac8d784e25ae5da7523afca9 + REF ea786c46b7a1b5158789293d9b148b379fc9914c # v8.1.0 + SHA512 3c4ab3db35b3eb019149ac455f0c7a262081e9866b7e49eaba05424bf837debccf0c987c2555d3c91a2cff2d1ba4b41862f544fd4684558f3a319616ef3c9eb3 HEAD_REF master PATCHES 0003-fix-cmake.patch @@ -56,12 +56,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if (OPENVDB_BUILD_TOOLS) vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) +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/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index cb7969105..242f3f46e 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openvdb", - "version": "8.0.0", + "version": "8.1.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "dependencies": [ |
