mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 14:42:48 +08:00
[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
This commit is contained in:
parent
f4f8bba9d4
commit
277e9a7f46
@ -1,13 +1,17 @@
|
||||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
|
||||
index 5081e0f..f76725a 100644
|
||||
--- a/build/cmake/CMakeLists.txt
|
||||
+++ b/build/cmake/CMakeLists.txt
|
||||
@@ -108,7 +108,7 @@ if (MSVC)
|
||||
target_compile_options (glew PRIVATE -GS-)
|
||||
target_compile_options (glew_s PRIVATE -GS-)
|
||||
# remove stdlib dependency
|
||||
- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
|
||||
+ # target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
|
||||
string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
|
||||
elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
|
||||
# remove stdlib dependency on windows with GCC and Clang (for similar reasons
|
||||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
|
||||
index 419c243..f81fab4 100644
|
||||
--- a/build/cmake/CMakeLists.txt
|
||||
+++ b/build/cmake/CMakeLists.txt
|
||||
@@ -120,9 +120,9 @@ if (MSVC)
|
||||
target_compile_options (glew PRIVATE -GS-)
|
||||
target_compile_options (glew_s PRIVATE -GS-)
|
||||
# remove stdlib dependency
|
||||
- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
|
||||
- target_link_libraries (glew LINK_PRIVATE libvcruntime.lib)
|
||||
- target_link_libraries (glew LINK_PRIVATE msvcrt.lib )
|
||||
+ #target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
|
||||
+ #target_link_libraries (glew LINK_PRIVATE libvcruntime.lib)
|
||||
+ #target_link_libraries (glew LINK_PRIVATE msvcrt.lib )
|
||||
string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
|
||||
elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
|
||||
# remove stdlib dependency on windows with GCC and Clang (for similar reasons
|
||||
|
@ -5,28 +5,28 @@ endif()
|
||||
# Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases.
|
||||
# More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz"
|
||||
FILENAME "glew-2.1.0.tgz"
|
||||
SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
|
||||
URLS "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.tgz"
|
||||
FILENAME "glew-2.2.0.tgz"
|
||||
SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REF glew
|
||||
PATCHES fix-LNK2019.patch
|
||||
PATCHES
|
||||
fix-LNK2019.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}/build/cmake
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/build/cmake"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DBUILD_UTILS=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glew)
|
||||
# Skip check the required dependency opengl
|
||||
vcpkg_fixup_pkgconfig(SKIP_CHECK)
|
||||
|
||||
@ -45,18 +45,18 @@ foreach(FILE ${_targets_cmake_files})
|
||||
file(WRITE ${FILE} "${_contents}")
|
||||
endforeach()
|
||||
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib ${CURRENT_PACKAGES_DIR}/lib/glew32.lib)
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib" "${CURRENT_PACKAGES_DIR}/lib/glew32.lib")
|
||||
endif()
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib)
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
|
||||
foreach(FILE ${CURRENT_PACKAGES_DIR}/include/GL/glew.h ${CURRENT_PACKAGES_DIR}/include/GL/wglew.h ${CURRENT_PACKAGES_DIR}/include/GL/glxew.h)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
||||
foreach(FILE "${CURRENT_PACKAGES_DIR}/include/GL/glew.h" "${CURRENT_PACKAGES_DIR}/include/GL/wglew.h" "${CURRENT_PACKAGES_DIR}/include/GL/glxew.h")
|
||||
file(READ ${FILE} _contents)
|
||||
string(REPLACE "#ifdef GLEW_STATIC" "#if 1" _contents "${_contents}")
|
||||
file(WRITE ${FILE} "${_contents}")
|
||||
@ -65,9 +65,9 @@ endif()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
@ -1,10 +1,17 @@
|
||||
{
|
||||
"name": "glew",
|
||||
"version-string": "2.1.0",
|
||||
"port-version": 11,
|
||||
"version-string": "2.2.0",
|
||||
"description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.",
|
||||
"homepage": "https://github.com/nigels-com/glew",
|
||||
"dependencies": [
|
||||
"opengl"
|
||||
"opengl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -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})
|
||||
|
@ -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)
|
||||
|
@ -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": [
|
||||
|
@ -1,7 +0,0 @@
|
||||
Source: xtensor-io
|
||||
Version: 0.9.0
|
||||
Port-Version: 1
|
||||
Description: xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5
|
||||
Homepage: https://github.com/xtensor-stack/xtensor-io
|
||||
Build-Depends: xtensor, xtl
|
||||
|
@ -1,20 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c3595a1..d38dc21 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -136,6 +136,7 @@ else()
|
||||
message(WARNING "ZLIB not found - install zlib for xnpz file support")
|
||||
endif()
|
||||
|
||||
+if (0)
|
||||
message(STATUS "Trying to find HighFive for npz file support")
|
||||
find_package(HighFive)
|
||||
find_package(HDF5)
|
||||
@@ -154,6 +155,7 @@ if (${HighFive_FOUND} AND ${HDF5_FOUND})
|
||||
else()
|
||||
message(WARNING "HighFive and/or HDF5 not found - install HighFive and HDF5 for HDF5 file support")
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
|
||||
set(BUILD_TESTS ON)
|
@ -3,27 +3,23 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO xtensor-stack/xtensor-io
|
||||
REF 863dd7dad6010038568c169f20e3d3e87bd3b37a # 0.9.0
|
||||
SHA512 f6190c5c2c487a8170e5af1ddfd2e921c414274762dac6c8f9519d579d5eb5dd3683678e7b4f589b7ced8a42f648742755acb42e2122960d6ca7fc1a82b0723e
|
||||
REF 2bc048b3f34731385f29e2f3b307103ee6d4e5ab # 0.12.8
|
||||
SHA512 d7c5c85489aea9b9d8af7ee33a43dd8ab888e7f03da8b533ace39e143f89acbae4fe88bb10253931a3cc44041e1532bd76483686f7f20c00e2850647a574349c
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
disable-highfive.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DBUILD_TESTS=OFF
|
||||
-DDOWNLOAD_GTEST=OFF
|
||||
-DDOWNLOAD_GBENCHMARK=OFF
|
||||
-DHAVE_HighFive=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
18
ports/xtensor-io/vcpkg.json
Normal file
18
ports/xtensor-io/vcpkg.json
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "xtensor-io",
|
||||
"version": "0.12.8",
|
||||
"description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5",
|
||||
"homepage": "https://github.com/xtensor-stack/xtensor-io",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"xtensor",
|
||||
"xtl"
|
||||
]
|
||||
}
|
@ -2345,8 +2345,8 @@
|
||||
"port-version": 3
|
||||
},
|
||||
"glew": {
|
||||
"baseline": "2.1.0",
|
||||
"port-version": 11
|
||||
"baseline": "2.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"glfw3": {
|
||||
"baseline": "3.3.4",
|
||||
@ -4777,7 +4777,7 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"openvdb": {
|
||||
"baseline": "8.0.0",
|
||||
"baseline": "8.1.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"openvpn3": {
|
||||
@ -6937,8 +6937,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"xtensor-io": {
|
||||
"baseline": "0.9.0",
|
||||
"port-version": 1
|
||||
"baseline": "0.12.8",
|
||||
"port-version": 0
|
||||
},
|
||||
"xtl": {
|
||||
"baseline": "0.7.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3211ed09c36542372ab3f1f690a42e2edbb072bc",
|
||||
"version-string": "2.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69",
|
||||
"version-string": "2.1.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ecd4c1d0e5c1e497615d75cb0748c97fa1d70384",
|
||||
"version": "8.1.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "5dd93bca4d648b1e0ab01d3cf4df79a183944688",
|
||||
"version": "8.0.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0f70c1f44abb24d6d3883b9cd5efd4acc0473787",
|
||||
"version": "0.12.8",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "3320a5f7436e8ecde84b90eb918806fbf034cafa",
|
||||
"version-string": "0.9.0",
|
||||
|
Loading…
Reference in New Issue
Block a user