Updated CMake script to detect arm64

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fa7901ab14f35b68607238ffad8e0f792d01935..59669a02e7314bc6817130197560d2b33bceb42c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@ option(WITH_TESTS_COVERAGE "Analyze test coverage using gcov (only for gcc)" OFF
 option(WITH_BOOST_ATOMIC "Use boost atomics (only for boost >= 1.54)" OFF)
 option(WITH_ASAN "Build AddressSantinizer instrumented code" OFF)
 option(WITH_TSAN "Build ThreadSantinizer instrumented code" OFF)
-option(WITH_BREAKPAD "Use google breakpad to generate minidump for tests" OFF)
 set(CMAKE_TARGET_ARCHITECTURE "" CACHE string "Target build architecture")
 
 find_package(Threads)
@@ -79,32 +78,6 @@ if(WITH_TESTS_COVERAGE)
     endif()
 endif(WITH_TESTS_COVERAGE)
 
-if(WITH_BREAKPAD)
-    if( NOT ${BREAKPAD_INCLUDE_DIR})
-        if(${BREAKPAD_ROOT})
-            set(BREAKPAD_INCLUDE_DIR "${BREAKPAD_ROOT}/include")
-        endif()
-    endif()
-
-    if( NOT ${BREAKPAD_LIBRARY_DIR})
-        if(${BREAKPAD_ROOT})
-            set(BREAKPAD_LIBRARY_DIR "${BREAKPAD_ROOT}/lib")
-        endif()
-    endif()
-    
-    if( NOT ${BREAKPAD_INCLUDE_DIR} OR NOT ${BREAKPAD_LIBRARY_DIR})
-        message(FATAL_ERROR 
-            "Could not find breakpad include or library dir."
-            "Specify -DBREAKPAD_ROOT in command line"
-            "or BREAKPAD_INCLUDE_DIR (usually $BREAKPAD_ROOT/include)"
-            "and BREAKPAD_LIBRARY_DIR (usually $BREAKPAD_ROOT/lib)"
-        )
-    endif()
-    
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BREAKPAD_INCLUDE_DIR}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${BREAKPAD_LIBRARY_DIR} -lbreakpad_client")
-endif(WITH_BREAKPAD)
-
 set(CDS_SHARED_LIBRARY ${PROJECT_NAME})
 set(CDS_STATIC_LIBRARY ${PROJECT_NAME}-s)
 

diff --git a/build/cmake/TargetArch.cmake b/build/cmake/TargetArch.cmake
index b1b56c3528947a5682f9f30b9f52e3e193618831..026eace0767245b0b11775c2c6911114f281a670 100644 (file)
--- a/build/cmake/TargetArch.cmake
+++ b/build/cmake/TargetArch.cmake
@@ -29,6 +29,12 @@ set(archdetect_c_code "
     #else
         #error cmake_ARCH arm
     #endif
+#elif defined(__aarch64__)
+    #if defined(__ARM_ARCH) && __ARM_ARCH == 8
+        #error cmake_ARCH armv8
+    #else
+        #error cmake_ARCH arm64
+    #endif
 #elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
     #error cmake_ARCH i386
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)