diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-06-09 15:49:27 -0400 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-06-09 15:49:27 -0400 |
| commit | 97c532453412cf2ab0d375ef975ccc8be0131377 (patch) | |
| tree | adc523c4092473cba65ca9c41d12f0248a9ae908 /Modules/FindZLIB.cmake | |
| parent | bba61bc8a7a7f399a5c9d18172160d424bbc9f7d (diff) | |
| download | cmake-97c532453412cf2ab0d375ef975ccc8be0131377.tar.gz | |
BUG: don't append to ZLIB_NAMES
ENH: also check for zdll on windows
ENH: honor REQUIRED and QUIETLY
Alex
Diffstat (limited to 'Modules/FindZLIB.cmake')
| -rw-r--r-- | Modules/FindZLIB.cmake | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index e648817ad0..b2a1a66b30 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -5,23 +5,41 @@ # ZLIB_LIBRARIES - List of libraries when using zlib. # ZLIB_FOUND - True if zlib found. + +IF (ZLIB_INCLUDE_DIR) + # Already in cache, be silent + SET(ZLIB_FIND_QUIETLY TRUE) +ENDIF (ZLIB_INCLUDE_DIR) + FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/local/include /usr/include ) -SET(ZLIB_NAMES ${ZLIB_NAMES} z zlib) -FIND_LIBRARY(ZLIB_LIBRARY - NAMES ${ZLIB_NAMES} - PATHS /usr/lib /usr/local/lib +SET(ZLIB_NAMES z zlib zdll) +FIND_LIBRARY(ZLIB_LIBRARY + NAMES ${ZLIB_NAMES} + PATHS /usr/lib /usr/local/lib ) -IF(ZLIB_INCLUDE_DIR) - IF(ZLIB_LIBRARY) - SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) - SET( ZLIB_FOUND "YES" ) - ENDIF(ZLIB_LIBRARY) -ENDIF(ZLIB_INCLUDE_DIR) +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) + +IF (ZLIB_FOUND) + IF (NOT ZLIB_FIND_QUIETLY) + MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}") + ENDIF (NOT ZLIB_FIND_QUIETLY) +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) +ENDIF (ZLIB_FOUND) MARK_AS_ADVANCED( ZLIB_LIBRARY |