diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3c0dd29..eab142ce7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,23 +56,29 @@ if (HAVE_AVX2)
         set(MMSEQS_ARCH "${MMSEQS_ARCH} -mavx2 -mcx16 -Wa,-q")
     endif ()
     set(X64 1)
-elseif (HAVE_SSE4_1)
+endif ()
+if (HAVE_SSE4_1)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -msse4.1 -mcx16")
     set(X64 1)
-elseif (HAVE_SSE2)
+endif ()
+if (HAVE_SSE2)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -msse2")
     set(DISABLE_IPS4O 1)
     set(X64 1)
-elseif (HAVE_POWER9)
+endif ()
+if (HAVE_POWER9)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -mcpu=power9 -mvsx")
     set(PPC64 1)
-elseif (HAVE_POWER8)
+endif ()
+if (HAVE_POWER8)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -mcpu=power8 -mvsx")
     set(PPC64 1)
-elseif (HAVE_ARM8)
+endif ()
+if (HAVE_ARM8)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -march=armv8-a+simd")
     set(ARM 1)
-elseif (HAVE_S390X)
+endif ()
+if (HAVE_S390X)
     set(MMSEQS_ARCH "${MMSEQS_ARCH} -march=z14 -mzarch -mzvector")
     set(ZARCH 1)
 endif ()