Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zfp] update to 1.0.0 #28616

Merged
merged 16 commits into from
Feb 9, 2023
11 changes: 0 additions & 11 deletions ports/zfp/fix-build-error.patch

This file was deleted.

72 changes: 0 additions & 72 deletions ports/zfp/fix-install-tools.patch

This file was deleted.

42 changes: 18 additions & 24 deletions ports/zfp/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,44 +1,38 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LLNL/zfp
REF 0.5.5
SHA512 c043cee73f6e972e047452552ab2ceb9247a6747fdb7e5f863aeab3a05208737c0bcabbe29f3c10e5c1aba961ec47aa6a0abdb395486fa0d5fb16a4ad45733c4
REF f39af72648a2aeb88e9b2cca8c64f51b493ad5f4 #1.0.0
SHA512 943c147a5170defe8e40c6b5ffc736dcc5a4fd33ab5b3e71aab9194821d68e4b6d093f11c76532ae011cbee44c861b04feb01e36789a9858b10ebfa808416e92
HEAD_REF master
PATCHES
fix-build-error.patch
fix-install-tools.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
all BUILD_ALL
cfp BUILD_CFP
test BUILD_TESTING
example BUILD_EXAMPLES
utility BUILD_UTILITIES
FEATURES
all BUILD_ALL
cfp BUILD_CFP
utility BUILD_UTILITIES
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
-DBUILD_ZFPY=OFF
-DBUILD_ZFORP=OFF
-DBUILD_TESTING=OFF
-DBUILD_ALL=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})

# Rename problematic root include "bitstream.h"; conflicts with x265's private headers
file(RENAME ${CURRENT_PACKAGES_DIR}/include/bitstream.h ${CURRENT_PACKAGES_DIR}/include/zfp/bitstream.h)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/zfp.h "\"bitstream.h\"" "\"zfp/bitstream.h\"")

if("utility" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES zfpcmd AUTO_CLEAN)
endif()

vcpkg_copy_pdbs()

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)
31 changes: 22 additions & 9 deletions ports/zfp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,35 @@
{
"name": "zfp",
"version-string": "0.5.5",
"port-version": 3,
"version": "1.0.0",
"description": "Zfp is an open source C/C++ library for compressed numerical arrays that support high throughput read and write random access. zfp also supports streaming compression of integer and floating-point data, e.g., for applications that read and write large data sets to and from disk. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.",
"homepage": "https://github.com/LLNL/zfp",
"license": "BSD-3-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"all": {
"description": "Build all components"
"description": "Obsolete. This feature is left for compatibility",
"dependencies": [
{
"name": "zfp",
"features": [
"cfp",
"utility"
]
}
]
},
"cfp": {
"description": "cfp support for cfp"
},
"example": {
"description": "Build example"
},
"test": {
"description": "Build test"
},
"utility": {
"description": "Build utility"
}
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8493,8 +8493,8 @@
"port-version": 6
},
"zfp": {
"baseline": "0.5.5",
"port-version": 3
"baseline": "1.0.0",
"port-version": 0
},
"zint": {
"baseline": "2.12.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zfp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bb3d795346f73dc90971a02729ca94d38a226b08",
"version": "1.0.0",
"port-version": 0
},
{
"git-tree": "b9fdf34882de98a9ffaf9225f665b49176d7e97f",
"version-string": "0.5.5",
Expand Down