diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-06-23 21:58:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 12:58:50 -0700 |
| commit | 23eadeaedcff93c3d8bfed4835990a9effc098d5 (patch) | |
| tree | 87110bb3cac2b3a8462ef89f5aed7b791e403a6f /ports/field3d | |
| parent | 6f33316686fc8f2cf4eddbe44b9515836c94f6aa (diff) | |
| download | vcpkg-23eadeaedcff93c3d8bfed4835990a9effc098d5.tar.gz vcpkg-23eadeaedcff93c3d8bfed4835990a9effc098d5.zip | |
[hdf5] Update HDF5 to 1.12 (#11747)
* [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download
* [hdf5] bump control
* [hdf5] fix szip and typo about linkage
* [hdf5] add missing package namespace.... they somehow missed to set it?
* [hdf5] retry without "
* [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows
* fix typo
* remove ws
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* linebreak first patch
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* ws change
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [field3d] update copying installation
* [hdf5] use official github repo
* clean baseline
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/field3d')
| -rw-r--r-- | ports/field3d/CONTROL | 4 | ||||
| -rw-r--r-- | ports/field3d/hdf5.api.patch | 14 | ||||
| -rw-r--r-- | ports/field3d/portfile.cmake | 16 |
3 files changed, 24 insertions, 10 deletions
diff --git a/ports/field3d/CONTROL b/ports/field3d/CONTROL index c65ac02c5..965ad7477 100644 --- a/ports/field3d/CONTROL +++ b/ports/field3d/CONTROL @@ -1,6 +1,6 @@ Source: field3d -Version: 1.7.2 +Version: 1.7.3 Homepage: https://github.com/imageworks/Field3D Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk. -Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format +Build-Depends: hdf5[core], boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format Supports: !(windows|arm|uwp)
\ No newline at end of file diff --git a/ports/field3d/hdf5.api.patch b/ports/field3d/hdf5.api.patch new file mode 100644 index 000000000..21a08baeb --- /dev/null +++ b/ports/field3d/hdf5.api.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e608b3ec..5ff2c3c31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,8 @@ + CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) + + PROJECT ( field3d ) +- ++add_definitions(-UH5_USE_112_API_DEFAULT) ++add_definitions(-DH5_USE_110_API_DEFAULT) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) + + FIND_PACKAGE (Doxygen) diff --git a/ports/field3d/portfile.cmake b/ports/field3d/portfile.cmake index 5170e97a3..ccbfcd95a 100644 --- a/ports/field3d/portfile.cmake +++ b/ports/field3d/portfile.cmake @@ -1,8 +1,5 @@ -include(vcpkg_common_functions) -if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Windows is currently not supported.") -elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm") +if (TRIPLET_SYSTEM_ARCH MATCHES "arm") message(FATAL_ERROR "ARM is currently not supported.") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Error: UWP builds are currently not supported.") @@ -11,16 +8,19 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO imageworks/Field3D - REF v1.7.2 - SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2 + REF v1.7.3 + SHA512 de3f10ff120420925de67064b2169f2a30c9180e308acc9090d70567b45be5423f4b1f7eb32bb376c887cea1364803cf7b2db66c2bc49f8a39a1037bbf0e5f39 HEAD_REF master PATCHES fix-build_error.patch + hdf5.api.patch # Switches the HDF5 default API for this port to 1.10 ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + "-DINSTALL_DOCS:BOOL=OFF" ) vcpkg_install_cmake() @@ -31,5 +31,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/field3d) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/field3d/COPYING ${CURRENT_PACKAGES_DIR}/share/field3d/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
\ No newline at end of file |