projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01e93d5
)
Fix for #1902 is merged from trunk
author
Andrey Kamaev
<no@email>
Mon, 7 May 2012 14:05:06 +0000
(14:05 +0000)
committer
Andrey Kamaev
<no@email>
Mon, 7 May 2012 14:05:06 +0000
(14:05 +0000)
cmake/OpenCVIOLibs.cmake
patch
|
blob
|
history
diff --git
a/cmake/OpenCVIOLibs.cmake
b/cmake/OpenCVIOLibs.cmake
index
621d00e
..
8b0dd08
100644
(file)
--- 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)