diff options
| author | David Faure <faure@kde.org> | 2006-04-14 11:49:02 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-04-14 11:49:02 +0000 |
| commit | 968fec0a7b604bb1c463aae6ff7bb9726407af72 (patch) | |
| tree | 49718559bcf80cb38a92710dfda96da18887cb8d /modules/FindZLIB.cmake | |
| parent | b00b040aa62ce0331b5cf533efcdfaa89c697d94 (diff) | |
| download | extra-cmake-modules-968fec0a7b604bb1c463aae6ff7bb9726407af72.tar.gz extra-cmake-modules-968fec0a7b604bb1c463aae6ff7bb9726407af72.tar.bz2 | |
Actually use the cache whenever possible. Should speed up the re-configuring that happens so often.
svn path=/trunk/KDE/kdelibs/; revision=529759
Diffstat (limited to 'modules/FindZLIB.cmake')
| -rw-r--r-- | modules/FindZLIB.cmake | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake index b3df2bae..0348cdd7 100644 --- a/modules/FindZLIB.cmake +++ b/modules/FindZLIB.cmake @@ -1,28 +1,41 @@ +IF (CACHED_ZLIB) -FIND_PATH(ZLIB_INCLUDE_DIR zlib.h + # in cache already + IF ("${CACHED_ZLIB}" STREQUAL "YES") + SET(ZLIB_FOUND TRUE) + ENDIF ("${CACHED_ZLIB}" STREQUAL "YES") + +ELSE (CACHED_ZLIB) + + FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/include /usr/local/include -) + ) -FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib -PATHS + FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib + PATHS /usr/lib /usr/local/lib -) + ) -IF (ZLIB_INCLUDE_DIR) - SET(ZLIB_FOUND TRUE) -ENDIF (ZLIB_INCLUDE_DIR) + IF (ZLIB_INCLUDE_DIR) + SET(ZLIB_FOUND TRUE) + SET(CACHED_ZLIB "YES") + ELSE (ZLIB_INCLUDE_DIR) + SET(CACHED_ZLIB "NO") + ENDIF (ZLIB_INCLUDE_DIR) + IF (ZLIB_FOUND) + IF (NOT ZLIB_FIND_QUIETLY) + MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}") + ENDIF (NOT ZLIB_FIND_QUIETLY) + ELSE (ZLIB_FOUND) + IF (ZLIB_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find z library") + ENDIF (ZLIB_FIND_REQUIRED) + ENDIF (ZLIB_FOUND) -IF (ZLIB_FOUND) - IF (NOT ZLIB_FIND_QUIETLY) - MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}") - ENDIF (NOT ZLIB_FIND_QUIETLY) -ELSE (ZLIB_FOUND) - IF (ZLIB_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find z library") - ENDIF (ZLIB_FIND_REQUIRED) -ENDIF (ZLIB_FOUND) + SET(CACHED_ZLIB ${CACHED_ZLIB} CACHE INTERNAL "If zlib was checked") + MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) -MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +ENDIF (CACHED_ZLIB) |