]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Fix incorrect declaration of FORCE_SSE2
authorVladislav Shchapov <vladislav@shchapov.ru>
Tue, 25 Feb 2025 06:42:48 +0000 (11:42 +0500)
committerHans Kristian Rosbach <hk-git@circlestorm.org>
Sat, 26 Jul 2025 18:36:58 +0000 (20:36 +0200)
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
CMakeLists.txt

index aeb0ed25d79ea76e4c7e26842ea08515f11f3c7f..35f71b0f0202c2e2fb3992b352ef5d115daee94b 100644 (file)
@@ -600,13 +600,6 @@ if(MSVC)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
-if(BASEARCH_X86_FOUND)
-    # FORCE_SSE2 option will only be shown if HAVE_SSE2_INTRIN is true
-    if("${ARCH}" MATCHES "i[3-6]86")
-        cmake_dependent_option(FORCE_SSE2 "Always assume CPU is SSE2 capable" OFF "HAVE_SSE2_INTRIN" OFF)
-    endif()
-endif()
-
 #
 # Enable deflate_quick at level 1
 #
@@ -925,6 +918,10 @@ if(WITH_OPTIM)
         endif()
         if(WITH_SSE2)
             check_sse2_intrinsics()
+            # FORCE_SSE2 option will only be shown if HAVE_SSE2_INTRIN is true
+            if("${ARCH}" MATCHES "i[3-6]86")
+                cmake_dependent_option(FORCE_SSE2 "Always assume CPU is SSE2 capable" OFF "HAVE_SSE2_INTRIN" OFF)
+            endif()
             if(HAVE_SSE2_INTRIN)
                 add_definitions(-DX86_SSE2)
                 set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/compare256_sse2.c ${ARCHDIR}/slide_hash_sse2.c)