mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD(cmake): Cross-compile overlay on M1 macs

Browse Source 
The overlay doesn't work on ARM Macs, so we disable it on these
machines. However, the CMAKE_SYSTEM_PROCESSOR variable doesn't always
hold the target architecture and as it turned out it contained the host
arch on our M1 macOS builder, causing the overlay to be disabled for our
x86 macOS binaries that were cross-compiled from our M1 machine.

Therefore, we now leverage the system we also use to detect the target
architecture for passing it as a macro to our code.
This commit is contained in:
Robert Adam 2022-12-31 16:27:18 +01:00
parent bde29b6a84
commit 295b16f036
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -171,7 +171,7 @@ if(g15 AND WIN32)
add_subdirectory("helpers/g15helper")
endif()
if(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
if(APPLE AND MUMBLE_TARGET_ARCH MATCHES "arm.*")
# mach_override doesn't support ARM
# https://github.com/rentzsch/mach_override/issues/6
set(overlay OFF CACHE BOOL "" FORCE)