generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1902 added workaround for CMake 2.8.2 bug

Browse Source
This commit is contained in:
Andrey Kamaev 2012-05-07 14:01:36 +00:00
parent 57e26bde9f
commit 31723effe7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVIOLibs.cmake
View File

@ -9,7 +9,11 @@ if(BUILD_ZLIB)
unset_all(ZLIB_FOUND) unset_all(ZLIB_FOUND)
else() else()
include(FindZLIB) 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 "") ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION "")
endif() endif()
if(ZLIB_FOUND AND ANDROID) if(ZLIB_FOUND AND ANDROID)