From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 2 May 2020 18:06:03 +0000 (-0700)
Subject: Don't explicitly enable neon flag on MSVC ARM64 builds.
X-Git-Tag: 1.9.9-b1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5daf463f13c19e5d660471dc60cb26c8d4fa64cc;p=thirdparty%2Fzlib-ng.git

Don't explicitly enable neon flag on MSVC ARM64 builds.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b759d9ad..16a94364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,9 @@ elseif(MSVC)
     set(WARNFLAGS_DISABLE "")
     if(BASEARCH_ARM_FOUND)
         add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
-        set(NEONFLAG "/arch:VFPv4")
+        if(NOT ${ARCH} MATCHES "aarch64")
+            set(NEONFLAG "/arch:VFPv4")
+        endif()
     elseif(BASEARCH_X86_FOUND)
         if(NOT ${ARCH} MATCHES "x86_64")
             set(SSE2FLAG "/arch:SSE2")