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

minor cmake update

Browse Source
This commit is contained in:
Andrey Kamaev 2012-03-01 10:44:19 +00:00
parent 368181bf4e
commit 0db570b1ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVIOLibs.cmake
View File

@ -19,7 +19,7 @@ if(NOT ZLIB_FOUND)
set(ZLIB_INCLUDE_DIR "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
endif()
################### libtiff - optional
################### libtiff - optional (should be searched after zlib)
if(WITH_TIFF)
if(BUILD_TIFF)
set(TIFF_FOUND FALSE)
@ -67,14 +67,14 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
endif()
################### libpng - optional
################### libpng - optional (should be searched after zlib)
if(WITH_PNG)
if(BUILD_PNG)
set(PNG_FOUND FALSE)
else()
include(FindPNG)
if(PNG_FOUND)
check_include_file(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)
check_include_file(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)
check_include_file(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)
endif()
endif()