commit 5214f01de4ac38f16c671832a1802cefc5443bd3 parent 5125c613524ad79673a17b0d9649259360e8b283 Author: d.levin256@gmail.com <d.levin256@gmail.com> Date: Wed, 31 Mar 2021 22:50:32 +0000 Fix x86 cross building on Apple Silicon Diffstat:
M | CMakeLists.txt | | | 6 | ++++-- |
M | cmake/target_set_arch.cmake | | | 5 | ++--- |
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -47,10 +47,12 @@ message( ) message(STATUS CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}) +set(X86 FALSE) if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") set(X86 TRUE) -else () - set(X86 FALSE) +endif () +if (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + set(X86 TRUE) endif () if (X86) diff --git a/cmake/target_set_arch.cmake b/cmake/target_set_arch.cmake @@ -1,7 +1,6 @@ +if (X86) -if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") - - function(target_set_arch TARGET MODE ARCH) + function(target_set_arch TARGET MODE ARCH) set(ARCH_FLAGS_GNU_generic -DCMT_FORCE_GENERIC_CPU) set(ARCH_FLAGS_GNU_sse2 -msse2)