diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-12-28 21:21:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 21:21:03 -0800 |
| commit | 8f8f7168ee0a524d4f71e632fd5cf2936d96469c (patch) | |
| tree | ca4d2085410b0ef47fcab501d070aec45b07d318 /ports/highfive | |
| parent | 580da706ed3502f1b1fcd9ab70212cda548d3520 (diff) | |
| download | vcpkg-8f8f7168ee0a524d4f71e632fd5cf2936d96469c.tar.gz vcpkg-8f8f7168ee0a524d4f71e632fd5cf2936d96469c.zip | |
[cmake] update to 3.19.2 (#14716)
* [cmake] update to 3.19.0
* update vmss
* [cmake] update to 3.19.1
* [solid3] Fix configure error, fix static definition
* [flann] Add feature hdf5 and fix it
* [highfive] Fix dependency hdf5
* [simage] Fix configure error
* [aws-c-common] Fix configure error
* [cmake] Update to 3.19.2
* Revert changes about cmake bug
* [VMSS] Update cmake path on Windows
* [cmake] Update cmake hash
* [minc] Fix dependency hdf5
* [cmake] Update cmake package name and path on MacOS
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/highfive')
| -rw-r--r-- | ports/highfive/CONTROL | 1 | ||||
| -rw-r--r-- | ports/highfive/fix-dependency-hdf5.patch | 19 | ||||
| -rw-r--r-- | ports/highfive/portfile.cmake | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/ports/highfive/CONTROL b/ports/highfive/CONTROL index 22fd1209e..36481faa2 100644 --- a/ports/highfive/CONTROL +++ b/ports/highfive/CONTROL @@ -1,5 +1,6 @@ Source: highfive Version: 2.2.2 +Port-Version: 1 Homepage: https://github.com/BlueBrain/HighFive Description: HighFive is a modern C++/C++11 friendly interface for libhdf5 Build-Depends: hdf5 diff --git a/ports/highfive/fix-dependency-hdf5.patch b/ports/highfive/fix-dependency-hdf5.patch new file mode 100644 index 000000000..e85a6fd94 --- /dev/null +++ b/ports/highfive/fix-dependency-hdf5.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake +index f76e1d3..06ac647 100644 +--- a/CMake/HighFiveTargetDeps.cmake ++++ b/CMake/HighFiveTargetDeps.cmake +@@ -8,7 +8,13 @@ add_library(libdeps INTERFACE) + if(NOT DEFINED HDF5_C_LIBRARIES) + set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency + set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5}) +- find_package(HDF5 REQUIRED) ++ find_package(hdf5 CONFIG REQUIRED) ++ set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL}) ++ if (TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-static) ++ endif() + endif() + + if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL) diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 6c73deff5..092a461bd 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v2.2.2 SHA512 7e562951b18425f1bfc96c30d0e47b6d218830417a732856a27943cd7ee6feab54d833b94aa303c40ca5038ac1aaf0eadd8c61800ffe82b6da46a465b21b1fc4 HEAD_REF master + PATCHES fix-dependency-hdf5.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |