[coreml-tools] Update to 7.2, fix linker errors for Foundation.framew…

…ork (#219) * [coreml-tools] update to 7.2 * link with Foundation.framework * [coreml-tools] change patches * always use Foundation.framework * [coreml-tools] update baseline
luncliff · Jul 13, 2024 · bdac610 · bdac610
1 parent 4e7e71e
commit bdac610
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/ports/coreml-tools/fix-cmake.patch b/ports/coreml-tools/fix-cmake.patch
@@ -10,7 +10,7 @@ index d462525..1f97838 100644
 
  if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    message(FATAL_ERROR "
-@@ -31,34 +32,49 @@ if(HAS_CCACHE)
+@@ -31,34 +32,46 @@ if(HAS_CCACHE)
    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
  endif()
 
@@ -38,12 +38,9 @@ index d462525..1f97838 100644
 -message("Found python version ${PYTHON_VERSION_STRING}")
 -message("Found python includes ${PYTHON_INCLUDE_DIRS}")
 +find_package(protobuf CONFIG REQUIRED) # protobuf::libprotobuf
++link_libraries("-framework Foundation")
 +
 +add_subdirectory(mlmodel)
-+
-+message(STATUS "Found python at ${Python3_EXECUTABLE}")
-+message(STATUS "Found python version ${Python3_VERSION}")
-+message(STATUS "Found python includes ${Python3_INCLUDE_DIRS}")
 
  include_directories(
    .

diff --git a/ports/coreml-tools/portfile.cmake b/ports/coreml-tools/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apple/coremltools
-    REF 7.1
-    SHA512 64a8f9f9a47266d58b5c19fb7ad21458a481ea7d11309bd46ffc3390771f70c7ccb958abfdeedad86e7785fe320d532928441cc120d0e3570e96d149ec458b72
+    REF 7.2
+    SHA512 0b86c3a424376a432985d327935439ce215257201372d781f710ea4177b94bb404c315fb3a00e4efa2d8c4c8693fe97ec0f969d62c2e86f465a92f1c8074d158
     HEAD_REF master
     PATCHES
         fix-cmake.patch

diff --git a/ports/coreml-tools/vcpkg.json b/ports/coreml-tools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "coreml-tools",
-  "version": "7.1",
+  "version": "7.2",
   "description": "Core ML tools contain supporting tools for Core ML model conversion, editing, and validation.",
   "homepage": "https://coremltools.readme.io/",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -17,7 +17,7 @@
       "port-version": 0
     },
     "coreml-tools": {
-      "baseline": "7.1",
+      "baseline": "7.2",
       "port-version": 0
     },
     "cpuinfo": {

diff --git a/versions/c-/coreml-tools.json b/versions/c-/coreml-tools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ada2a92a3d198d069caaf9f5b02ba1384b53a0bc",
+      "version": "7.2",
+      "port-version": 0
+    },
     {
       "git-tree": "6023229599457eec35aa0d825d4d30e23eb5e5ea",
       "version": "7.1",