From 4a0249f865bc82a3aa81365aeb4c916fa50f7706 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 25 Jun 2012 16:03:45 +0000 Subject: [PATCH] Minor update for zlib search --- cmake/OpenCVFindLibsGrfmt.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake index d5bfa1fbf..54a1bde5f 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -7,11 +7,11 @@ if(BUILD_ZLIB) ocv_clear_vars(ZLIB_FOUND) else() 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_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)