[matio] Merge mat73 and hdf5 features with mat73 name (#42103)

This commit is contained in:
Silvio Traversaro 2024-11-16 01:07:54 +01:00 committed by GitHub
parent e10bf14d44
commit 8cbab05e49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 18 deletions

View File

@ -11,10 +11,10 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
hdf5 MATIO_WITH_HDF5 mat73 MATIO_WITH_HDF5
mat73 MATIO_MAT73
zlib MATIO_WITH_ZLIB zlib MATIO_WITH_ZLIB
extended-sparse MATIO_EXTENDED_SPARSE extended-sparse MATIO_EXTENDED_SPARSE
mat73 MATIO_MAT73
pic MATIO_PIC pic MATIO_PIC
) )

View File

@ -1,6 +1,7 @@
{ {
"name": "matio", "name": "matio",
"version": "1.5.27", "version": "1.5.27",
"port-version": 1,
"description": "MATLAB MAT File I/O Library", "description": "MATLAB MAT File I/O Library",
"homepage": "https://github.com/tbeu/matio", "homepage": "https://github.com/tbeu/matio",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
@ -11,15 +12,15 @@
} }
], ],
"default-features": [ "default-features": [
"hdf5", "mat73",
"zlib" "zlib"
], ],
"features": { "features": {
"extended-sparse": { "extended-sparse": {
"description": "Enable extended sparse matrix data types not supported in MATLAB" "description": "Enable extended sparse matrix data types not supported in MATLAB"
}, },
"hdf5": { "mat73": {
"description": "Check for HDF5 library", "description": "Enable support for version 7.3 MAT files using the HDF5 library",
"dependencies": [ "dependencies": [
{ {
"name": "hdf5", "name": "hdf5",
@ -34,18 +35,6 @@
} }
] ]
}, },
"mat73": {
"description": "Enable support for version 7.3 MAT files",
"dependencies": [
{
"name": "matio",
"default-features": false,
"features": [
"hdf5"
]
}
]
},
"pic": { "pic": {
"description": "Enable position-independent code (PIC), i.e., compilation with the -fPIC flag" "description": "Enable position-independent code (PIC), i.e., compilation with the -fPIC flag"
}, },

View File

@ -5822,7 +5822,7 @@
}, },
"matio": { "matio": {
"baseline": "1.5.27", "baseline": "1.5.27",
"port-version": 0 "port-version": 1
}, },
"matplotlib-cpp": { "matplotlib-cpp": {
"baseline": "2020-08-27", "baseline": "2020-08-27",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5365545edb3db0730c490d4b03dcb84e8f7839dd",
"version": "1.5.27",
"port-version": 1
},
{ {
"git-tree": "d841cddf1c82ca09a7f7b465219e6d5fd32b9db4", "git-tree": "d841cddf1c82ca09a7f7b465219e6d5fd32b9db4",
"version": "1.5.27", "version": "1.5.27",