diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-18 13:56:45 -0400 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-18 13:56:45 -0400 |
| commit | b5f656e0de6e39f0fd935203e0ef2b4231af733d (patch) | |
| tree | 8b58020cca8fef8af4df6ae631fddf49e3230049 /Modules/FindZLIB.cmake | |
| parent | e118a62709fdc84e6c5b5b8d0bb055895d206ec9 (diff) | |
| download | cmake-b5f656e0de6e39f0fd935203e0ef2b4231af733d.tar.gz | |
ENH: use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX
modules, remove some of the extra search paths which are also searched by
default
Alex
Diffstat (limited to 'Modules/FindZLIB.cmake')
| -rw-r--r-- | Modules/FindZLIB.cmake | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index b2a1a66b30..fd6798fd49 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -11,37 +11,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 -) +FIND_PATH(ZLIB_INCLUDE_DIR zlib.h) SET(ZLIB_NAMES z zlib zdll) -FIND_LIBRARY(ZLIB_LIBRARY - NAMES ${ZLIB_NAMES} - PATHS /usr/lib /usr/local/lib -) +FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ) -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 ZLIB_LIBRARY ZLIB_INCLUDE_DIR) -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) +IF(ZLIB_FOUND) + SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) +ELSE(ZLIB_FOUND) + SET( ZLIB_LIBRARIES ) +ENDIF(ZLIB_FOUND) -MARK_AS_ADVANCED( - ZLIB_LIBRARY - ZLIB_INCLUDE_DIR - ) +MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) |