Merge pull request #3495 from taka-no-me:fix_android_arm64

10 years ago · fed1b3fd59
parent 25378587e2 9582c33eab
commit fed1b3fd59
1 changed files with 1 additions and 1 deletions
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@ -14,7 +14,7 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIRS})
 file(GLOB lib_srcs *.c)
 file(GLOB lib_hdrs *.h)

-if(NEON)
+if(NEON AND CMAKE_SIZEOF_VOID_P EQUAL 4)
  list(APPEND lib_srcs arm/filter_neon.S)
  add_definitions(-DPNG_ARM_NEON)
 endif()