potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #8900 from alalek:update_android_build

Browse Source
This commit is contained in:
Vadim Pisarevsky
2017-06-23 10:58:52 +00:00
parent 259147e32c 3e3e2dd512
commit fa7e7e0ff9
24 changed files with 240 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/CMakeLists.txt
+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})