ci: 修复mac编译错误

MaaXYZ · Sep 8, 2023 · 9e2f5a6 · 9e2f5a6
1 parent 1b6bfd3
commit 9e2f5a6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -211,6 +211,7 @@ jobs:
           CXX: "/usr/local/opt/llvm/bin/clang++"
         run: |
           cmake --preset 'NinjaMulti' \
+            -DARCH='${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}' \
             -DM9A_HASH_VERSION='${{ needs.meta.outputs.tag }}'
 
           cmake --build build --preset 'NinjaMulti - Release' -j 16

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -30,13 +30,10 @@ endif ()
 
 if (APPLE)
     set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path")
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        add_compile_definitions(MAA_USE_FMTLIB)
-        add_compile_options("-Wno-deprecated-declarations") # supress tmpnam
-        if ("${MAADEPS_TRIPLET}" STREQUAL "maa-arm64-osx")
-            add_compile_options("-arch;arm64")
-            add_link_options("-arch;arm64")
-        endif ()
+    add_compile_options("-Wno-deprecated-declarations") # supress tmpnam
+    if ("${ARCH}" STREQUAL "arm64")
+        add_compile_options("-arch;arm64")
+        add_link_options("-arch;arm64")
     endif ()
 elseif (UNIX)
     set(CMAKE_INSTALL_RPATH "$ORIGIN")

diff --git a/cmake/framework.cmake → deps/.gitkeep b/cmake/framework.cmake → deps/.gitkeep