Commit ba238562 authored by Andrey Kamaev's avatar Andrey Kamaev

Fix for #1902 is merged from trunk

parent 01e93d57
......@@ -9,7 +9,11 @@ if(BUILD_ZLIB)
unset_all(ZLIB_FOUND)
else()
include(FindZLIB)
if(ZLIB_FOUND AND NOT ZLIB_VERSION_STRING)
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 "")
endif()
if(ZLIB_FOUND AND ANDROID)
......
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