From e8aaca422a3e51547a11cdbab9b651ffcb07049a Mon Sep 17 00:00:00 2001
From: Hao Guan <10684225+hguandl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 03:12:22 +1000
Subject: [PATCH] cmake: macOS architectures

---
 cmake/fastdeploy.cmake | 33 +++++++++++++++++++++------------
 cmake/opencv.cmake     | 21 +++++++++++++--------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/cmake/fastdeploy.cmake b/cmake/fastdeploy.cmake
index 0c1ce0ffe2..329fd97f66 100644
--- a/cmake/fastdeploy.cmake
+++ b/cmake/fastdeploy.cmake
@@ -6,16 +6,21 @@ set(FASTDEPLOY_TAG "g22325d23")
 
 set(COMPRESSED_SUFFIX ".tar.gz")
 
-if(UNIX)
-    set(FASTDEPLOY_FILENAME "FastDeploy-Linux")
-    set(FASTDEPLOY_CHECKSUM "5e1dedc72714f6f11fb1dfbc720d675203525152b777bd2711ba26f2a95e5f99")
-elseif(WIN32)
+if(WIN32)
     set(FASTDEPLOY_FILENAME "FastDeploy-Windows")
-    set(FASTDEPLOY_CHECKSUM "0ea6064921a0af50ba8a1593fe1652a11379acad53f15e100731f02c3c9edfd1")
+    set(FASTDEPLOY_CHECKSUM "83e23fd701c828b8e15e38806db65cde71c4fbba3482ca1e24ba23c44fb19028")
 elseif(APPLE)
-    set(FASTDEPLOY_FILENAME "FastDeploy-macOS")
-    set(FASTDEPLOY_CHECKSUM "80188fb70c5632ba5b93338d5c6d323619430dcad77043250399dce8fb480d8d")
-endif(UNIX)
+    if (CURRENT_OSX_ARCH STREQUAL "arm64")
+        set(FASTDEPLOY_FILENAME "FastDeploy-macOS-arm64")
+        set(FASTDEPLOY_CHECKSUM "e77cd3382859165dddcf98d71f433b815345baa11b3c2b01ce16bb2141f78a8a")
+    else()
+        set(FASTDEPLOY_FILENAME "FastDeploy-macOS-x86_64")
+        set(FASTDEPLOY_CHECKSUM "7f1d5c4be83a479b819c33b094db5db565ae14c07bf0977b6a9b7a68d6b2a013")
+    endif()
+else()
+    set(FASTDEPLOY_FILENAME "FastDeploy-Linux")
+    set(FASTDEPLOY_CHECKSUM "b13891669242c6d219508ae99afba9fadde1ada4af9b3d5781298f58fef9bd34")
+endif(WIN32)
 
 set(FASTDEPLOY_URL ${FASTDEPLOY_URL_PREFIX}/${FASTDEPLOY_TAG}/${FASTDEPLOY_FILENAME}${COMPRESSED_SUFFIX})
 
@@ -31,10 +36,14 @@ else ()
                         ${THIRD_PARTY_PATH}/install/)
     set(FASTDEPLOY_FILENAME fastdeploy)
     set(FastDeploy_DIR ${THIRD_PARTY_PATH}/install/${FASTDEPLOY_FILENAME})
-    
-    find_package(FastDeploy REQUIRED PATHS ${FastDeploy_DIR} NO_DEFAULT_PATH)
-    include_directories(${FastDeploy_INCLUDE_DIRS})
-    list(APPEND DEPEND_LIBS ${FastDeploy_LIBS})
+
+    if (APPLE)
+        list(APPEND DEPEND_LIBS ${FastDeploy_DIR}/lib/libfastdeploy.dylib)
+    else ()
+        find_package(FastDeploy REQUIRED PATHS ${FastDeploy_DIR} NO_DEFAULT_PATH)
+        include_directories(${FastDeploy_INCLUDE_DIRS})
+        list(APPEND DEPEND_LIBS ${FastDeploy_LIBS})
+    endif (APPLE)
 endif (FASTDEPLOY_DIRECTORY)
 
 if (INSTALL_THIRD_LIBS)
diff --git a/cmake/opencv.cmake b/cmake/opencv.cmake
index 9e3069653c..5786a976e5 100644
--- a/cmake/opencv.cmake
+++ b/cmake/opencv.cmake
@@ -6,16 +6,21 @@ set(OPENCV_TAG "4.5.3")
 
 set(COMPRESSED_SUFFIX ".tar.gz")
 
-if(UNIX)
-    set(OPENCV_FILENAME "OpenCV-Linux")
-    set(OPENCV_CHECKSUM "ab41d96f64d8aada3c06584f88bcc5c94eab9f8a4c1a6fbe2e20d83d5509f1c3")
-elseif(WIN32)
+if(WIN32)
     set(OPENCV_FILENAME "OpenCV-Windows")
-    set(OPENCV_CHECKSUM "92213f8615d5ca74bf6a8a3681abaac1f5981f9da6b5a1808759909329bb5ea2")
+    set(OPENCV_CHECKSUM "bf736b243bbdaa020f139e4dfa1e4f15633f4ce7a8ad885524645e660de47a8b")
 elseif(APPLE)
-    set(OPENCV_FILENAME "OpenCV-macOS")
-    set(OPENCV_CHECKSUM "44d6308696ee0b38d1ba40b8b16ee0cb1da4a0f9f72b6916afc5b18b99a9089e")
-endif(UNIX)
+    if (CURRENT_OSX_ARCH STREQUAL "arm64")
+        set(OPENCV_FILENAME "OpenCV-macOS-arm64")
+        set(OPENCV_CHECKSUM "31beb633c033dd4ee789ffa50911c29c9580860f9a91f334f03d8aa9c85e9700")
+    else()
+        set(OPENCV_FILENAME "OpenCV-macOS-x86_64")
+        set(OPENCV_CHECKSUM "249c5c97cc52257b68d35acf499b1cf1037f5e6f3b40752f82ad5abe7884bea9")
+    endif()
+else(UNIX)
+    set(OPENCV_FILENAME "OpenCV-Linux")
+    set(OPENCV_CHECKSUM "edc4138456189c9e8bdf29114ad2be8ec152e8e31087d98e633f6cda59b141ea")
+endif(WIN32)
 
 set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_TAG}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX})