Merge pull request #7259 from alalek:issue_7232

8 years ago · c1024b112e
parent 6dd609a709 d402bac69d
commit c1024b112e
1 changed files with 2 additions and 1 deletions
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@ -33,7 +33,8 @@ if(ENABLE_NEON)
  add_definitions(-DPNG_ARM_NEON_OPT=2)
 endif()

-if(ENABLE_SSE)
+if(ENABLE_SSE
+    AND (NOT MSVC OR (MSVC_VERSION GREATER 1799))) # MSVS2013+ (issue #7232)
  list(APPEND lib_srcs contrib/intel/intel_init.c contrib/intel/filter_sse2_intrinsics.c)
  add_definitions(-DPNG_INTEL_SSE)
 endif()