From acb4db3c810d48838134e6d04f08c28d73da0c7e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Feb 2023 03:08:50 +0100 Subject: [PATCH] [matio] fix inter feature dependencies (#29224) --- ports/matio/vcpkg.json | 20 ++++++++++++++++++-- versions/baseline.json | 2 +- versions/m-/matio.json | 5 +++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index 33ca2f9cd5..b5ff9bbc07 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matio", "version": "1.5.23", - "port-version": 1, + "port-version": 2, "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", "license": "BSD-2-Clause", @@ -25,11 +25,27 @@ { "name": "hdf5", "default-features": false + }, + { + "name": "matio", + "default-features": false, + "features": [ + "zlib" + ] } ] }, "mat73": { - "description": "Enable support for version 7.3 MAT files" + "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 ba4f2a6f9f..9c34514e9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4866,7 +4866,7 @@ }, "matio": { "baseline": "1.5.23", - "port-version": 1 + "port-version": 2 }, "matplotlib-cpp": { "baseline": "2020-08-27", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index ff31937758..bfd65ec39e 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28df0a44f618c5fd412fafda91507f3bad6ac4b1", + "version": "1.5.23", + "port-version": 2 + }, { "git-tree": "ee4fd8ab9268b332bd49e3b506033487a39afe26", "version": "1.5.23",