mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor update for zlib search

Browse Source
This commit is contained in:
Andrey Kamaev 2012-06-25 16:03:45 +00:00
parent 4ee236b1b6
commit 4a0249f865
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -7,11 +7,11 @@ if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND) ocv_clear_vars(ZLIB_FOUND)
else() else()
include(FindZLIB) include(FindZLIB)
if(ZLIB_VERSION_STRING)
#cmake 2.8.2 bug - it fails to determine zlib version
unset(ZLIB_VERSION_STRING CACHE)
endif()
if(ZLIB_FOUND) if(ZLIB_FOUND)
if(ZLIB_VERSION_STRING)
#cmake 2.8.2 bug - it fails to determine zlib version
unset(ZLIB_VERSION_STRING CACHE)
endif()
ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION "") ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION "")
endif() endif()
if(ZLIB_FOUND AND ANDROID) if(ZLIB_FOUND AND ANDROID)