Skip to content

O
opencv
Commit 0db570b1 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

minor cmake update

parent 368181bf
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cmake/OpenCVIOLibs.cmake
View file @ 0db570b1
...@@ -19,7 +19,7 @@ if(NOT ZLIB_FOUND) ...@@ -19,7 +19,7 @@ if(NOT ZLIB_FOUND)
set(ZLIB_INCLUDE_DIR "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}") set(ZLIB_INCLUDE_DIR "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
endif() endif()
################### libtiff - optional ################### libtiff - optional (should be searched after zlib)
if(WITH_TIFF) if(WITH_TIFF)
if(BUILD_TIFF) if(BUILD_TIFF)
set(TIFF_FOUND FALSE) set(TIFF_FOUND FALSE)
...@@ -67,14 +67,14 @@ if(WITH_JASPER AND NOT JASPER_FOUND) ...@@ -67,14 +67,14 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}") set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
endif() endif()
################### libpng - optional ################### libpng - optional (should be searched after zlib)
if(WITH_PNG) if(WITH_PNG)
if(BUILD_PNG) if(BUILD_PNG)
set(PNG_FOUND FALSE) set(PNG_FOUND FALSE)
else() else()
include(FindPNG) include(FindPNG)
if(PNG_FOUND) 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) check_include_file(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)
endif() endif()
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment