Merge pull request #7643 from alalek:libpng_aarch64

8 years ago · ad888c80cf
parent 099be88f02 a50bc7d824
commit ad888c80cf
1 changed files with 2 additions and 0 deletions
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@ -31,6 +31,8 @@ file(GLOB lib_hdrs *.h)
 if(ENABLE_NEON)
  list(APPEND lib_srcs arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c)
  add_definitions(-DPNG_ARM_NEON_OPT=2)
+elseif(AARCH64)
+  add_definitions(-DPNG_ARM_NEON_OPT=0) # NEON assembler is not supported
 endif()

 if(ENABLE_SSE