Skip to content

O
opencv
Commit babaa00a authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

libpng: fix NEON

parent 7c64e03c
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
3rdparty/libpng/CMakeLists.txt
View file @ babaa00a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(NEON) if(ARM AND ENABLE_NEON AND NOT AARCH64)
project(${PNG_LIBRARY} ASM) project(${PNG_LIBRARY} ASM)
else() else()
project(${PNG_LIBRARY}) project(${PNG_LIBRARY})
...@@ -14,9 +14,11 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR}) ...@@ -14,9 +14,11 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
file(GLOB lib_srcs *.c) file(GLOB lib_srcs *.c)
file(GLOB lib_hdrs *.h) file(GLOB lib_hdrs *.h)
if(ARM AND NEON) if(ARM AND ENABLE_NEON AND NOT AARCH64)
list(APPEND lib_srcs arm/filter_neon.S arm/arm_init.c) list(APPEND lib_srcs arm/filter_neon.S arm/arm_init.c)
add_definitions(-DPNG_ARM_NEON) add_definitions(-DPNG_ARM_NEON_OPT=2)
else()
add_definitions(-DPNG_ARM_NEON_OPT=0)
endif() endif()
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment