BUG: Fix bug with matio log call (#659)

openmeeg · May 22, 2024 · 7a44f73 · 7a44f73
1 parent 69c2f15
commit 7a44f73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -343,11 +343,7 @@ jobs:
           BREW_EXTRA=openblas
         fi
         echo "Installing dependencies with brew"
-        # TODO: Not libmatio 1.5.27 compatible
-        brew tap-new $USER/local-libmatio
-        brew tap homebrew/core --force
-        brew extract --version=1.5.26 libmatio $USER/local-libmatio
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install hdf5 libmatio@1.5.26 libomp swig $BREW_EXTRA
+        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install hdf5 libmatio libomp swig $BREW_EXTRA
         echo "brew install complete"
         if [[ "${{steps.env-vars.outputs.blas}}" == "OpenBLAS" ]]; then
           if [[ "$(arch)" == "arm64" ]]; then

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.14)
-project (OpenMEEG VERSION 2.5.9999 LANGUAGES C CXX)
+project (OpenMEEG VERSION 2.5.9 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 17)  # use c++17
 

diff --git a/OpenMEEGMaths/include/MatlabIO.H b/OpenMEEGMaths/include/MatlabIO.H
@@ -209,8 +209,11 @@ namespace OpenMEEG {
             }
 
         private:
-
+            #if MATIO_VERSION>=1527
+            static void matiologfunc(int log_level,const char* message) {
+            #else
             static void matiologfunc(const int log_level,char* message) {
+            #endif
 
                 //  Ugly copy of values in matio/io.c, but those are not exported...