From 31723effe7cd54b204bced62d3eeeba3f565e1df Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 7 May 2012 14:01:36 +0000 Subject: [PATCH] #1902 added workaround for CMake 2.8.2 bug --- cmake/OpenCVIOLibs.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVIOLibs.cmake b/cmake/OpenCVIOLibs.cmake index 621d00e528..8b0dd082ec 100644 --- a/cmake/OpenCVIOLibs.cmake +++ b/cmake/OpenCVIOLibs.cmake @@ -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)