factor out common cmake code for x86_64 and i386

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b2c26220c735cd6291f380e1a88e1aa2caed701..647ad19e65ff78fb2c344803b23bacf4507e2307 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -504,20 +504,19 @@ endmacro(add_intrinsics_option)
 
 set(ZLIB_ARCH_SRCS)
 set(ARCHDIR "arch/generic")
-if("${ARCH}" MATCHES "x86_64" OR "${ARCH}" MATCHES "AMD64")
+if("${ARCH}" MATCHES "x86_64" OR "${ARCH}" MATCHES "AMD64" OR "${ARCH}" MATCHES "i[3-6]86")
     set(ARCHDIR "arch/x86")
-    add_definitions(-DX86_NOCHECK_SSE2 -DUNALIGNED_OK)
-    add_feature_info(SSE2 1 "Use the SSE2 instruction set, using \"${SSE2FLAG}\"")
+    add_definitions(-DUNALIGNED_OK)
+    if("${ARCH}" MATCHES "x86_64" OR "${ARCH}" MATCHES "AMD64")
+      add_definitions(-DX86_NOCHECK_SSE2)
+    endif()
+    add_feature_info(SSE2 1 "Support the SSE2 instruction set, using \"${SSE2FLAG}\"")
 elseif("${ARCH}" MATCHES "arm")
     set(ARCHDIR "arch/arm")
     add_definitions(-DUNALIGNED_OK)
 elseif("${ARCH}" MATCHES "aarch64")
     set(ARCHDIR "arch/aarch64")
     add_definitions(-DUNALIGNED_OK)
-elseif("${ARCH}" MATCHES "i[3-6]86")
-    set(ARCHDIR "arch/x86")
-    add_definitions(-DUNALIGNED_OK)
-    add_feature_info(SSE2 1 "Support the SSE2 instruction set, using \"${SSE2FLAG}\"")
 else()
     message(STATUS "No optimized architecture: using ${ARCHDIR}")
 endif()