From 1679de5e5968bdeffd63793bed55048088216c18 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 31 Mar 2019 10:50:43 +0200 Subject: [PATCH] Detect 32bit environment on 64bit ARM hardware for #2056, using same approach as #2058 --- cmake/system_check.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/system_check.cmake b/cmake/system_check.cmake index f30a946b4..94d3ba643 100644 --- a/cmake/system_check.cmake +++ b/cmake/system_check.cmake @@ -49,7 +49,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") set(ARM 1) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") - set(ARM64 1) + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(ARM64 1) + else() + set(ARM 1) + endif() endif() if (X86_64)