Loading CMakeModules/FindZLIB.cmake +19 −33 Original line number Diff line number Diff line # # From CMake 2.6.1 + some path changes # # - Find zlib # Find the native ZLIB includes and library # Loading @@ -16,38 +20,20 @@ IF (ZLIB_INCLUDE_DIR) SET(ZLIB_FIND_QUIETLY TRUE) ENDIF (ZLIB_INCLUDE_DIR) FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/local/include /usr/include ${ZLIB_DIR_SEARCH}/local/include ) FIND_PATH(ZLIB_INCLUDE_DIR zlib.h PATHS ${ZLIB_DIR_SEARCH}/local/include) SET(ZLIB_NAMES z zlib zdll) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS /usr/lib /usr/local/lib ${ZLIB_DIR_SEARCH}/local/lib ) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS ${ZLIB_DIR_SEARCH}/local/lib) IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) SET(ZLIB_FOUND TRUE) SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) SET(ZLIB_FOUND FALSE) SET( ZLIB_LIBRARIES ) ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR) IF(ZLIB_FOUND) IF (NOT ZLIB_FIND_QUIETLY) MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}") ENDIF (NOT ZLIB_FIND_QUIETLY) SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) ELSE(ZLIB_FOUND) IF (ZLIB_FIND_REQUIRED) MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.") MESSAGE(FATAL_ERROR "Could NOT find z library") ENDIF (ZLIB_FIND_REQUIRED) SET( ZLIB_LIBRARIES ) ENDIF(ZLIB_FOUND) MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) Loading
CMakeModules/FindZLIB.cmake +19 −33 Original line number Diff line number Diff line # # From CMake 2.6.1 + some path changes # # - Find zlib # Find the native ZLIB includes and library # Loading @@ -16,38 +20,20 @@ IF (ZLIB_INCLUDE_DIR) SET(ZLIB_FIND_QUIETLY TRUE) ENDIF (ZLIB_INCLUDE_DIR) FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/local/include /usr/include ${ZLIB_DIR_SEARCH}/local/include ) FIND_PATH(ZLIB_INCLUDE_DIR zlib.h PATHS ${ZLIB_DIR_SEARCH}/local/include) SET(ZLIB_NAMES z zlib zdll) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS /usr/lib /usr/local/lib ${ZLIB_DIR_SEARCH}/local/lib ) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS ${ZLIB_DIR_SEARCH}/local/lib) IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) SET(ZLIB_FOUND TRUE) SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) SET(ZLIB_FOUND FALSE) SET( ZLIB_LIBRARIES ) ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR) IF(ZLIB_FOUND) IF (NOT ZLIB_FIND_QUIETLY) MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}") ENDIF (NOT ZLIB_FIND_QUIETLY) SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) ELSE(ZLIB_FOUND) IF (ZLIB_FIND_REQUIRED) MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.") MESSAGE(FATAL_ERROR "Could NOT find z library") ENDIF (ZLIB_FIND_REQUIRED) SET( ZLIB_LIBRARIES ) ENDIF(ZLIB_FOUND) MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )