Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 16, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b715d
[matio] Merge mat73 and hdf5 features with mat73 name
traversaro Nov 11, 2024
f9058c6
update versions
traversaro Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/matio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
hdf5 MATIO_WITH_HDF5
mat73 MATIO_WITH_HDF5
mat73 MATIO_MAT73
zlib MATIO_WITH_ZLIB
extended-sparse MATIO_EXTENDED_SPARSE
mat73 MATIO_MAT73
pic MATIO_PIC
)

Expand Down
19 changes: 4 additions & 15 deletions ports/matio/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "matio",
"version": "1.5.27",
"port-version": 1,
"description": "MATLAB MAT File I/O Library",
"homepage": "https://github.com/tbeu/matio",
"license": "BSD-2-Clause",
Expand All @@ -11,15 +12,15 @@
}
],
"default-features": [
"hdf5",
"mat73",
"zlib"
],
"features": {
"extended-sparse": {
"description": "Enable extended sparse matrix data types not supported in MATLAB"
},
"hdf5": {
"description": "Check for HDF5 library",
"mat73": {
"description": "Enable support for version 7.3 MAT files using the HDF5 library",
"dependencies": [
{
"name": "hdf5",
Expand All @@ -34,18 +35,6 @@
}
]
},
"mat73": {
"description": "Enable support for version 7.3 MAT files",
"dependencies": [
{
"name": "matio",
"default-features": false,
"features": [
"hdf5"
]
}
]
},
"pic": {
"description": "Enable position-independent code (PIC), i.e., compilation with the -fPIC flag"
},
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5802,7 +5802,7 @@
},
"matio": {
"baseline": "1.5.27",
"port-version": 0
"port-version": 1
},
"matplotlib-cpp": {
"baseline": "2020-08-27",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/matio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5365545edb3db0730c490d4b03dcb84e8f7839dd",
"version": "1.5.27",
"port-version": 1
},
{
"git-tree": "d841cddf1c82ca09a7f7b465219e6d5fd32b9db4",
"version": "1.5.27",
Expand Down