(#23730) Update matio to v1.5.27

* Update matio to v1.5.27 * Update recipes/matio/all/conanfile.py Co-authored-by: Rubén Rincón Blanco <[email protected]> * Explicitly disable Cppcheck --------- Co-authored-by: Rubén Rincón Blanco <[email protected]>
conan-io · Apr 24, 2024 · 7c859f9 · 7c859f9
1 parent 6019de9
commit 7c859f9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/recipes/matio/all/conandata.yml b/recipes/matio/all/conandata.yml
@@ -8,6 +8,9 @@ sources:
   "1.5.26":
     url: "https://downloads.sourceforge.net/project/matio/matio/1.5.26/matio-1.5.26.tar.gz"
     sha256: "8b47c29f58e468dba7a5555371c6a72ad4c6aa8b15f459b2b0b65a303c063933"
+  "1.5.27":
+    url: "https://downloads.sourceforge.net/project/matio/matio/1.5.27/matio-1.5.27.tar.gz"
+    sha256: "0a6aa00b18c4512b63a8d27906b079c8c6ed41d4b2844f7a4ae598e18d22d3b3"
 patches:
   "1.5.23":
     - patch_file: "patches/require-cmake-3.10.patch"
@@ -18,3 +21,6 @@ patches:
   "1.5.26":
     - patch_file: "patches/require-cmake-3.10.patch"
     - patch_file: "patches/cmake-install-bundle.patch"
+  "1.5.27":
+    - patch_file: "patches/require-cmake-3.10.patch"
+    - patch_file: "patches/cmake-install-bundle-1.5.27.patch"
diff --git a/recipes/matio/all/conanfile.py b/recipes/matio/all/conanfile.py
@@ -67,6 +67,7 @@ def source(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        tc.variables["MATIO_ENABLE_CPPCHECK"] = False
         tc.variables["MATIO_EXTENDED_SPARSE"] = self.options.extended_sparse
         tc.variables["MATIO_PIC"] = self.options.get_safe("fPIC", True)
         tc.variables["MATIO_SHARED"] = self.options.shared

diff --git a/recipes/matio/all/patches/cmake-install-bundle-1.5.27.patch b/recipes/matio/all/patches/cmake-install-bundle-1.5.27.patch
@@ -0,0 +1,14 @@
+Fix CMake configuration errors while cross-building to iOS/tvOS/watchOS
+
+--- a/cmake/tools.cmake
++++ b/cmake/tools.cmake
+@@ -8,8 +8,5 @@ if(NOT HAVE_GETOPT)
+ endif()
+
+ install(TARGETS matdump
+-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
diff --git a/recipes/matio/config.yml b/recipes/matio/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.5.27":
+    folder: all
   "1.5.26":
     folder: all
   "1.5.24":