Merge pull request #3495 from taka-no-me:fix_android_arm64
This commit is contained in:
commit
fed1b3fd59
2
3rdparty/libpng/CMakeLists.txt
vendored
2
3rdparty/libpng/CMakeLists.txt
vendored
@ -14,7 +14,7 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIRS})
|
|||||||
file(GLOB lib_srcs *.c)
|
file(GLOB lib_srcs *.c)
|
||||||
file(GLOB lib_hdrs *.h)
|
file(GLOB lib_hdrs *.h)
|
||||||
|
|
||||||
if(NEON)
|
if(NEON AND CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||||
list(APPEND lib_srcs arm/filter_neon.S)
|
list(APPEND lib_srcs arm/filter_neon.S)
|
||||||
add_definitions(-DPNG_ARM_NEON)
|
add_definitions(-DPNG_ARM_NEON)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user