[Cmake-commits] [cmake-commits] alex committed FindPNG.cmake 1.19 1.20

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17372

Modified Files:
	FindPNG.cmake 
Log Message:
fix #9152: find ZLIB quietly if PNG is searched QUIETLY

Alex


Index: FindPNG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPNG.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** FindPNG.cmake	21 Jul 2009 16:45:37 -0000	1.19
--- FindPNG.cmake	14 Sep 2009 19:53:07 -0000	1.20
***************
*** 10,14 ****
  # None of the above will be defined unles zlib can be found.
  # PNG depends on Zlib
! include(FindZLIB)
  
  if(ZLIB_FOUND)
--- 10,19 ----
  # None of the above will be defined unles zlib can be found.
  # PNG depends on Zlib
! 
! 
! if(PNG_FIND_QUIETLY)
!   set(_FIND_ZLIB_ARG QUIET)
! endif(PNG_FIND_QUIETLY)
! find_package(ZLIB ${_FIND_ZLIB_ARG})
  
  if(ZLIB_FOUND)
***************
*** 40,44 ****
  # all listed variables are TRUE
  include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
  
  mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )
--- 45,49 ----
  # all listed variables are TRUE
  include(FindPackageHandleStandardArgs)
! find_package_handle_standard_args(PNG  DEFAULT_MSG  PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
  
  mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )