mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[zfp] update to 1.0.0 (#28616)
* [zfp] update to 1.0.0 * update version * update portfile.cmake * update version * update patch * update version * update portfile.cmake * update version * remove patch * update version * update vcpkg.json * update version * update portfile.cmake * update version
This commit is contained in:
parent
5d0f4ccbc9
commit
42d21b2c8a
@ -1,11 +0,0 @@
|
||||
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
|
||||
index a960d2c..e6a492d 100644
|
||||
--- a/utils/CMakeLists.txt
|
||||
+++ b/utils/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
add_executable(zfpcmd zfp.c)
|
||||
-set_property(TARGET zfpcmd PROPERTY OUTPUT_NAME zfp)
|
||||
+#set_property(TARGET zfpcmd PROPERTY OUTPUT_NAME zfp)
|
||||
target_link_libraries(zfpcmd zfp)
|
||||
if(HAVE_LIBM_MATH)
|
||||
target_link_libraries(zfpcmd m)
|
@ -1,72 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 47179fd..96add54 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -220,8 +220,8 @@ add_subdirectory(src)
|
||||
option(BUILD_ALL "Build all subdirectories" OFF)
|
||||
if(BUILD_ALL)
|
||||
set(BUILD_CFP ON CACHE BOOL "Build CFP arrays library" FORCE)
|
||||
- set(BUILD_ZFORP ON CACHE BOOL "Build Fortran library" FORCE)
|
||||
- set(BUILD_ZFPY ON CACHE BOOL "Build python bindings for zfp" FORCE)
|
||||
+ set(BUILD_ZFORP OFF CACHE BOOL "Build Fortran library" FORCE)
|
||||
+ set(BUILD_ZFPY OFF CACHE BOOL "Build python bindings for zfp" FORCE)
|
||||
set(BUILD_UTILITIES ON CACHE BOOL "Build command line utilities for zfp" FORCE)
|
||||
set(BUILD_EXAMPLES ON CACHE BOOL "Build Examples" FORCE)
|
||||
endif()
|
||||
diff --git a/cfp/src/CMakeLists.txt b/cfp/src/CMakeLists.txt
|
||||
index 386698c..ecba525 100644
|
||||
--- a/cfp/src/CMakeLists.txt
|
||||
+++ b/cfp/src/CMakeLists.txt
|
||||
@@ -36,3 +36,5 @@ install(TARGETS cfp EXPORT cfp-targets
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+
|
||||
+install(DIRECTORY ${ZFP_SOURCE_DIR}/cfp/include DESTINATION include)
|
||||
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
||||
index 7cc7606..6ca1034 100644
|
||||
--- a/examples/CMakeLists.txt
|
||||
+++ b/examples/CMakeLists.txt
|
||||
@@ -34,3 +34,20 @@ if(HAVE_LIBM_MATH)
|
||||
target_link_libraries(pgm m)
|
||||
target_link_libraries(simple m)
|
||||
endif()
|
||||
+
|
||||
+install(TARGETS diffusion
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+ if(BUILD_CFP)
|
||||
+ install(TARGETS diffusionC
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+ endif()
|
||||
+install(TARGETS inplace
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+install(TARGETS iterator
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+install(TARGETS pgm
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+install(TARGETS simple
|
||||
+ RUNTIME DESTINATION tools)
|
||||
+install(TARGETS speed
|
||||
+ RUNTIME DESTINATION tools)
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index d15246e..7a6c6cb 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -19,3 +19,6 @@ if(ZFP_BUILD_TESTING_LARGE)
|
||||
endforeach()
|
||||
endforeach()
|
||||
endif()
|
||||
+
|
||||
+install(TARGETS testzfp
|
||||
+ RUNTIME DESTINATION tools)
|
||||
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
|
||||
index a960d2c..5fcbf87 100644
|
||||
--- a/utils/CMakeLists.txt
|
||||
+++ b/utils/CMakeLists.txt
|
||||
@@ -4,3 +4,6 @@ target_link_libraries(zfpcmd zfp)
|
||||
if(HAVE_LIBM_MATH)
|
||||
target_link_libraries(zfpcmd m)
|
||||
endif()
|
||||
+
|
||||
+install(TARGETS zfpcmd
|
||||
+ RUNTIME DESTINATION tools)
|
@ -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)
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -8521,8 +8521,8 @@
|
||||
"port-version": 6
|
||||
},
|
||||
"zfp": {
|
||||
"baseline": "0.5.5",
|
||||
"port-version": 3
|
||||
"baseline": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"zint": {
|
||||
"baseline": "2.12.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bb3d795346f73dc90971a02729ca94d38a226b08",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b9fdf34882de98a9ffaf9225f665b49176d7e97f",
|
||||
"version-string": "0.5.5",
|
||||
|
Loading…
x
Reference in New Issue
Block a user