kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #9152: find ZLIB quietly if PNG is searched QUIETLY

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2009-09-14 15:53:07 -04:00
parent 0a8532c3a0
commit 72f32c2b98
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindPNG.cmake
View File

@ -9,7 +9,12 @@
# PNG_LIBRARY, where to find the PNG library. # PNG_LIBRARY, where to find the PNG library.
# None of the above will be defined unles zlib can be found. # None of the above will be defined unles zlib can be found.
# PNG depends on Zlib # PNG depends on Zlib
include(FindZLIB)
if(PNG_FIND_QUIETLY)
set(_FIND_ZLIB_ARG QUIET)
endif(PNG_FIND_QUIETLY)
find_package(ZLIB ${_FIND_ZLIB_ARG})
if(ZLIB_FOUND) if(ZLIB_FOUND)
find_path(PNG_PNG_INCLUDE_DIR png.h find_path(PNG_PNG_INCLUDE_DIR png.h
@ -39,6 +44,6 @@ endif(ZLIB_FOUND)
# handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR) find_package_handle_standard_args(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY ) mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )