Merge pull request #9856 from GregoryMorse:patch-1

[platform/upstream/opencv.git] / cmake / OpenCVCompilerOptimizations.cmake

diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake
index fea13ce..2696ac2 100644 (file)
--- a/cmake/OpenCVCompilerOptimizations.cmake
+++ b/cmake/OpenCVCompilerOptimizations.cmake
@@ -256,12 +256,14 @@ elseif(ARM OR AARCH64)
   ocv_update(CPU_FP16_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_fp16.cpp")
   if(NOT AARCH64)
     ocv_update(CPU_KNOWN_OPTIMIZATIONS "VFPV3;NEON;FP16")
-    ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3")
-    ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon")
-    ocv_update(CPU_NEON_FLAGS_CONFLICT "-mfpu=[^ ]*")
-    ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16")
+    if(NOT MSVC)
+      ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3")
+      ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon")
+      ocv_update(CPU_NEON_FLAGS_CONFLICT "-mfpu=[^ ]*")
+      ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16")
+      ocv_update(CPU_FP16_FLAGS_CONFLICT "-mfpu=[^ ]*")
+    endif()
     ocv_update(CPU_FP16_IMPLIES "NEON")
-    ocv_update(CPU_FP16_FLAGS_CONFLICT "-mfpu=[^ ]*")
   else()
     ocv_update(CPU_KNOWN_OPTIMIZATIONS "NEON;FP16")
     ocv_update(CPU_NEON_FLAGS_ON "")