[hamradio-commits] [gnss-sdr] 157/303: Detect aarch64 architecture (e.g. Odroid C2)

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 8465ea9ed3b7acac0be62ad08f5a2b05a0604bdd
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Nov 10 00:16:41 2016 +0100

    Detect aarch64 architecture (e.g. Odroid C2)
---
 cmake/Modules/TestForARM.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/Modules/TestForARM.cmake b/cmake/Modules/TestForARM.cmake
index 1217fb4..e092a4a 100644
--- a/cmake/Modules/TestForARM.cmake
+++ b/cmake/Modules/TestForARM.cmake
@@ -27,9 +27,12 @@ set (ARM_VERSION "")
 if (CMAKE_COMPILER_IS_GNUCXX)
   execute_process(COMMAND echo "int main(){}"
                   COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} -dM -E -
-		  OUTPUT_VARIABLE TEST_FOR_ARM_RESULTS)
+                  OUTPUT_VARIABLE TEST_FOR_ARM_RESULTS)
 
   string(REGEX MATCH "__arm" ARM_FOUND "${TEST_FOR_ARM_RESULTS}")
+  if(ARM_FOUND STREQUAL "")
+     string(REGEX MATCH "__aarch64" ARM_FOUND "${TEST_FOR_ARM_RESULTS}")
+  endif(ARM_FOUND STREQUAL "")
 
   if (NOT ARM_FOUND STREQUAL "")
     set(IS_ARM YES)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git