diff options
| author | ZeeWanderer <mxx888777@gmail.com> | 2020-09-05 17:19:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-05 07:19:43 -0700 |
| commit | abda2ddcb4e5f0d074fe8c8d83c2e5cd525ec370 (patch) | |
| tree | 2fd2f633fa185959beb3331e454317574308d311 | |
| parent | 9ae0b0dc7499c305cbcddfada64d5e7e63f50645 (diff) | |
| download | vcpkg-abda2ddcb4e5f0d074fe8c8d83c2e5cd525ec370.tar.gz vcpkg-abda2ddcb4e5f0d074fe8c8d83c2e5cd525ec370.zip | |
[highfive] Update to 2.2.2 (#13257)
| -rw-r--r-- | ports/hdf5/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/highfive/CONTROL | 10 | ||||
| -rw-r--r-- | ports/highfive/portfile.cmake | 21 |
3 files changed, 28 insertions, 5 deletions
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index d03fcc590..0c8ee3c08 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -1,3 +1,5 @@ +# highfive should be updated together with hdf5 + vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( diff --git a/ports/highfive/CONTROL b/ports/highfive/CONTROL index f072f8f91..22fd1209e 100644 --- a/ports/highfive/CONTROL +++ b/ports/highfive/CONTROL @@ -1,5 +1,13 @@ Source: highfive -Version: 2.1.1 +Version: 2.2.2 Homepage: https://github.com/BlueBrain/HighFive Description: HighFive is a modern C++/C++11 friendly interface for libhdf5 Build-Depends: hdf5 + +Feature: boost +Description: Enables Boost support +Build-Depends: boost-ublas, boost-multi-array + +Feature: tests +Description: Build unit tests +Build-Depends: highfive[boost], boost-test diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index a3ec43b69..2d79274ef 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -3,11 +3,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BlueBrain/HighFive - REF b9b25da543145166b01bcca01c3cbedfcbd06307 # v2.1.1 - SHA512 f1de563bf811c285447fdf8e88e4861f1ac0e10bf830cedec587b7a85dcfb2fc9b038dd1f71cbbbf4774c517b5097f3c4afad5048b6a3dfd21f8f0e23ab67ec1 + REF v2.2.2 + SHA512 7e562951b18425f1bfc96c30d0e47b6d218830417a732856a27943cd7ee6feab54d833b94aa303c40ca5038ac1aaf0eadd8c61800ffe82b6da46a465b21b1fc4 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tests HIGHFIVE_UNIT_TESTS + boost HIGHFIVE_USE_BOOST +) + if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") set(HDF5_USE_STATIC_LIBRARIES ON) endif() @@ -16,14 +21,22 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DHIGHFIVE_UNIT_TESTS=OFF + ${FEATURE_OPTIONS} -DHIGHFIVE_EXAMPLES=OFF - -DUSE_BOOST=OFF -DHIGH_FIVE_DOCUMENTATION=OFF -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} ) vcpkg_install_cmake() +if("tests" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + tests_high_five_base + tests_high_five_easy + tests_high_five_multi_dims + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/tests/unit" # Tools are not installed so release version tools are manually copied + ) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake) |