Hyperscan is available for x86_64 only so far

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 263249f3838acb0c0f9a1a6a8c345d436a3ad9a9..ae77b8330d10d75b9a8eb59c3fcd39e20b3031f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,16 @@ OPTION(ENABLE_CLANG_PLUGIN "Enable clang static analysing plugin [default: OFF]"
 OPTION(ENABLE_HYPERSCAN    "Enable hyperscan for fast regexp processing [default: OFF]" OFF)
 
 
-IF (ENABLE_HYPERSCAN MATCHES "ON")
-       ENABLE_LANGUAGE(CXX)
+INCLUDE(FindArch.cmake)
+TARGET_ARCHITECTURE(ARCH)
+
+IF ("${ARCH}" STREQUAL "x86_64")
+       IF (ENABLE_HYPERSCAN MATCHES "ON")
+               ENABLE_LANGUAGE(CXX)
+       ENDIF()
+ELSE()
+       MESSAGE(STATUS "Hyperscan support is possible only for x86_64 architecture")
+       SET(ENABLE_HYPERSCAN "OFF")
 ENDIF()
 # Build optimized code for following CPU (default i386)
 #SET(CPU_TUNE               "i686")

diff --git a/src/libcryptobox/FindArch.cmake b/FindArch.cmake
similarity index 100%
rename from src/libcryptobox/FindArch.cmake
rename to FindArch.cmake

diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
index a5c883ec5e890a8fdfe1f400d171f1380b2302ac..18736dc065a62c79b08abd1fd6ba8b745606a0df 100644 (file)
--- a/src/libcryptobox/CMakeLists.txt
+++ b/src/libcryptobox/CMakeLists.txt
@@ -1,9 +1,8 @@
-INCLUDE(FindArch.cmake)
 INCLUDE(AsmOp.cmake)
 
 TARGET_ARCHITECTURE(ARCH)
 
-SET(CHACHASRC ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/chacha.c 
+SET(CHACHASRC ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/chacha.c
        ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/ref.c)
 SET(POLYSRC ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/poly1305.c)
 SET(SIPHASHSRC ${CMAKE_CURRENT_SOURCE_DIR}/siphash/siphash.c
@@ -86,4 +85,4 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
 SET(LIBCRYPTOBOXSRC ${CMAKE_CURRENT_SOURCE_DIR}/cryptobox.c)
 
 SET(RSPAMD_CRYPTOBOX ${LIBCRYPTOBOXSRC} ${CHACHASRC} ${POLYSRC} ${SIPHASHSRC}
-       ${CURVESRC} ${BLAKE2SRC} PARENT_SCOPE)
\ No newline at end of file
+       ${CURVESRC} ${BLAKE2SRC} PARENT_SCOPE)