Skip to content

Commit 5feb087

Browse files
authored
Handle Apple labeling armv8 as arm64 rather than aarch64
1 parent fb3d80c commit 5feb087

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/system_check.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
5454
endif()
5555
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
5656
set(X86 1)
57-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
58-
set(ARM 1)
59-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
57+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
6058
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
6159
set(ARM64 1)
6260
else()
6361
set(ARM 1)
6462
endif()
63+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
64+
set(ARM 1)
6565
elseif (${CMAKE_CROSSCOMPILING})
6666
if (${TARGET} STREQUAL "CORE2")
6767
if (NOT BINARY)

0 commit comments

Comments
 (0)