1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

android: make optional "cpufeatures", build fixes for NDK r15

This commit is contained in:
Alexander Alekhin
2017-06-12 16:10:13 +00:00
committed by Alexander Alekhin
parent cf86f88c71
commit 3e3e2dd512
24 changed files with 240 additions and 155 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ if(HAVE_JPEG)
list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES})
endif()
if(WITH_WEBP)
if(HAVE_WEBP)
add_definitions(-DHAVE_WEBP)
ocv_include_directories(${WEBP_INCLUDE_DIR})
list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})