diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fa4d2d0..f07af6d0 100644 --- 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 index a5335e80..852c3524 100644 --- 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 b/deps/.gitkeep similarity index 100% rename from cmake/framework.cmake rename to deps/.gitkeep