mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 20:23:02 +08:00
[highfive] Update to v2.3 (#17990)
* [highfive] Update to v2.3 * [highfive] x-add-version highfive * [highfive] Modernize * [highfive] x-add-version --overwrite-version highfive * [highfive] Do not build docs * [highfive] Bump version * [highfive] Update * [highfive] Bump version
This commit is contained in:
myd7349
GitHub
parent
1d6e1be7ac
commit
be56553cbb
@ -1,14 +0,0 @@
|
||||
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
|
||||
|
||||
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
|
||||
@ -1,17 +1,17 @@
|
||||
diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake
|
||||
index f76e1d3..06ac647 100644
|
||||
index 51bc7b2..f04bf4c 100644
|
||||
--- a/CMake/HighFiveTargetDeps.cmake
|
||||
+++ b/CMake/HighFiveTargetDeps.cmake
|
||||
@@ -8,7 +8,13 @@ add_library(libdeps INTERFACE)
|
||||
@@ -10,7 +10,13 @@ if(NOT TARGET libdeps)
|
||||
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)
|
||||
+ if(TARGET hdf5::hdf5-shared)
|
||||
+ set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
|
||||
+ elseif (TARGET hdf5::hdf5-static)
|
||||
+ elseif(TARGET hdf5::hdf5-static)
|
||||
+ set(HDF5_C_LIBRARIES hdf5::hdf5-static)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
@ -1,32 +1,33 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO BlueBrain/HighFive
|
||||
REF v2.2.2
|
||||
SHA512 7e562951b18425f1bfc96c30d0e47b6d218830417a732856a27943cd7ee6feab54d833b94aa303c40ca5038ac1aaf0eadd8c61800ffe82b6da46a465b21b1fc4
|
||||
REF v2.3
|
||||
SHA512 5bf8bc6d3a57be39a4fd15f28f8c839706e2c8d6e2270f45ea39c28a2ac1e3c7f31ed2f48390a45a868c714c85f03f960a0bc8fad945c80b41f495e6f4aca36a
|
||||
HEAD_REF master
|
||||
PATCHES fix-dependency-hdf5.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
tests HIGHFIVE_UNIT_TESTS
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
boost HIGHFIVE_USE_BOOST
|
||||
tests HIGHFIVE_UNIT_TESTS
|
||||
xtensor HIGHFIVE_USE_XTENSOR
|
||||
)
|
||||
|
||||
if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static")
|
||||
set(HDF5_USE_STATIC_LIBRARIES ON)
|
||||
endif()
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HDF5_USE_STATIC_LIBRARIES)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DHIGHFIVE_EXAMPLES=OFF
|
||||
-DHIGH_FIVE_DOCUMENTATION=OFF
|
||||
-DHIGHFIVE_BUILD_DOCS=OFF
|
||||
-DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
|
||||
if("tests" IN_LIST FEATURES)
|
||||
vcpkg_copy_tools(
|
||||
TOOL_NAMES
|
||||
@ -37,7 +38,7 @@ if("tests" IN_LIST FEATURES)
|
||||
)
|
||||
endif()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
||||
if(NOT (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
@ -45,4 +46,4 @@ if(NOT (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows
|
||||
endif()
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/highfive RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
46
ports/highfive/vcpkg.json
Normal file
46
ports/highfive/vcpkg.json
Normal file
@ -0,0 +1,46 @@
|
||||
{
|
||||
"name": "highfive",
|
||||
"version": "2.3",
|
||||
"description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
|
||||
"homepage": "https://github.com/BlueBrain/HighFive",
|
||||
"license": "BSL-1.0",
|
||||
"dependencies": [
|
||||
"hdf5",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"boost": {
|
||||
"description": "Enables Boost support",
|
||||
"dependencies": [
|
||||
"boost-multi-array",
|
||||
"boost-serialization",
|
||||
"boost-ublas"
|
||||
]
|
||||
},
|
||||
"tests": {
|
||||
"description": "Build unit tests",
|
||||
"dependencies": [
|
||||
"boost-test",
|
||||
{
|
||||
"name": "highfive",
|
||||
"features": [
|
||||
"boost"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"xtensor": {
|
||||
"description": "Enable xtensor testing",
|
||||
"dependencies": [
|
||||
"xtensor"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2493,8 +2493,8 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"highfive": {
|
||||
"baseline": "2.2.2",
|
||||
"port-version": 1
|
||||
"baseline": "2.3",
|
||||
"port-version": 0
|
||||
},
|
||||
"hiredis": {
|
||||
"baseline": "1.0.0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "76c01340920e595af976269dec82132f192a4705",
|
||||
"version": "2.3",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b26cc2dbfcf688652fc8b8c711806c3034296237",
|
||||
"version-string": "2.2.2",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user