mirror of
https://github.com/opencv/opencv.git
synced 2024-11-29 13:47:32 +08:00
libpng: fix NEON
This commit is contained in:
parent
7c64e03cc9
commit
babaa00ac1
8
3rdparty/libpng/CMakeLists.txt
vendored
8
3rdparty/libpng/CMakeLists.txt
vendored
@ -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})
|
|||||||
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()
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user