diff options
Diffstat (limited to 'ports/zfp')
| -rw-r--r-- | ports/zfp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zfp/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/zfp/CONTROL b/ports/zfp/CONTROL index eb9505fa4..164bade9d 100644 --- a/ports/zfp/CONTROL +++ b/ports/zfp/CONTROL @@ -1,5 +1,5 @@ Source: zfp
-Version: 0.5.5-1
+Version: 0.5.5-2
Homepage: https://github.com/LLNL/zfp
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.
diff --git a/ports/zfp/portfile.cmake b/ports/zfp/portfile.cmake index 7c9af2547..d189762b7 100644 --- a/ports/zfp/portfile.cmake +++ b/ports/zfp/portfile.cmake @@ -31,12 +31,16 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+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})
+# 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\"")
+
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |