diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 146ca159c1..e34920220a 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -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 ) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index bbcecdc867..e79f557249 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -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", @@ -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", @@ -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" }, diff --git a/versions/baseline.json b/versions/baseline.json index 5ce3d835ae..1e283ef714 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5822,7 +5822,7 @@ }, "matio": { "baseline": "1.5.27", - "port-version": 0 + "port-version": 1 }, "matplotlib-cpp": { "baseline": "2020-08-27", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index 142c9fb2db..1d551d49cb 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5365545edb3db0730c490d4b03dcb84e8f7839dd", + "version": "1.5.27", + "port-version": 1 + }, { "git-tree": "d841cddf1c82ca09a7f7b465219e6d5fd32b9db4", "version": "1.5.27",