From 732fc7604b980d3424223c92933dbdec2dbc3ddb Mon Sep 17 00:00:00 2001
From: Hao Guan <10684225+hguandl@users.noreply.github.com>
Date: Fri, 23 Dec 2022 14:00:13 +1000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20macOS=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=BA=93=E9=97=AA=E9=80=80=20#3172?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/fastdeploy.cmake | 18 +++++++-----------
 cmake/macos.cmake      |  9 +++++++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cmake/fastdeploy.cmake b/cmake/fastdeploy.cmake
index 3bbbf69fbc..1a4f6138c5 100644
--- a/cmake/fastdeploy.cmake
+++ b/cmake/fastdeploy.cmake
@@ -8,18 +8,18 @@ set(COMPRESSED_SUFFIX ".tar.gz")
 
 if(WIN32)
     set(FASTDEPLOY_FILENAME "FastDeploy-Windows")
-    set(FASTDEPLOY_CHECKSUM "fa1e6457f0787f578fca877f11bc1dc41b6eb196c542946757224e80f24b8008")
+    set(FASTDEPLOY_CHECKSUM "0a0700d4e8923bcd4c387a658e5e9a689ed9e0d114c260b11d082a2176c233d4")
 elseif(APPLE)
     if (CURRENT_OSX_ARCH STREQUAL "arm64")
         set(FASTDEPLOY_FILENAME "FastDeploy-macOS-arm64")
-        set(FASTDEPLOY_CHECKSUM "5286563d17593f2124aff305181e22bedee264ef82730f54e6b538cacd9343ee")
+        set(FASTDEPLOY_CHECKSUM "28a771814d197ba8056f1fcb7cc0671facec90a8733a0dac2cf0b68a8cc36d24")
     else()
         set(FASTDEPLOY_FILENAME "FastDeploy-macOS-x86_64")
-        set(FASTDEPLOY_CHECKSUM "d0c8e4947301da1cbf295f79783c6016e1af139d67cc8ea3b532098ec6f1ae4d")
+        set(FASTDEPLOY_CHECKSUM "76e97c7e944a18eb160646fa32ac0a7e24c87751b2b127dc33454f993f6d4b97")
     endif()
 else()
     set(FASTDEPLOY_FILENAME "FastDeploy-Linux")
-    set(FASTDEPLOY_CHECKSUM "fc79d95251a82c584eac61c144f962de347469312c4be1d25fb2b8a624136998")
+    set(FASTDEPLOY_CHECKSUM "4d106e5499e9b5b29426667617215ac7e4e70d2353af10caccdfdf6c1f1534a7")
 endif(WIN32)
 
 set(FASTDEPLOY_URL ${FASTDEPLOY_URL_PREFIX}/${FASTDEPLOY_TAG}/${FASTDEPLOY_FILENAME}${COMPRESSED_SUFFIX})
@@ -37,13 +37,9 @@ else ()
     set(FASTDEPLOY_FILENAME fastdeploy)
     set(FastDeploy_DIR ${THIRD_PARTY_PATH}/install/${FASTDEPLOY_FILENAME})
 
-    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)
+    find_package(FastDeploy REQUIRED PATHS ${FastDeploy_DIR} NO_DEFAULT_PATH)
+    include_directories(${FastDeploy_INCLUDE_DIRS})
+    list(APPEND DEPEND_LIBS ${FastDeploy_LIBS})
 endif (FASTDEPLOY_DIRECTORY)
 
 if (INSTALL_THIRD_LIBS)
diff --git a/cmake/macos.cmake b/cmake/macos.cmake
index bf6a12e6fd..3161468125 100644
--- a/cmake/macos.cmake
+++ b/cmake/macos.cmake
@@ -7,8 +7,9 @@ if (BUILD_XCFRAMEWORK)
 
     add_custom_command(OUTPUT OpenCV.xcframework
         COMMAND rm -rf OpenCV.xcframework
-        COMMAND mv ${OPENCV_DIRECTORY}/lib/libopencv_world.4.5.3.dylib ${OPENCV_DIRECTORY}/lib/libopencv_world.4.5.dylib
-        COMMAND xcodebuild -create-xcframework -library ${OPENCV_DIRECTORY}/lib/libopencv_world.4.5.dylib -output OpenCV.xcframework
+        COMMAND rm -f libopencv_world.4.5.dylib
+        COMMAND cp ${OPENCV_DIRECTORY}/lib/libopencv_world.4.5.3.dylib libopencv_world.4.5.dylib
+        COMMAND xcodebuild -create-xcframework -library libopencv_world.4.5.dylib -output OpenCV.xcframework
     )
 
     add_custom_command(OUTPUT ONNXRuntime.xcframework
@@ -30,3 +31,7 @@ if (BUILD_XCFRAMEWORK)
         DEPENDS MaaCore Paddle2ONNX.xcframework MaaCore.xcframework OpenCV.xcframework ONNXRuntime.xcframework FastDeploy.xcframework
     )
 endif (BUILD_XCFRAMEWORK)
+
+target_compile_options(MaaCore PRIVATE
+    -Wno-deprecated-declarations
+    -Wno-gnu-zero-variadic-macro-arguments)