diff options
| author | Dusan Durech <dusan@debian.debian> | 2009-04-14 21:32:43 +0200 |
|---|---|---|
| committer | Dusan Durech <dusan@debian.debian> | 2009-04-14 21:32:43 +0200 |
| commit | d3d6ebad00db9ddafc4f2ee1d6bfe611625d29bc (patch) | |
| tree | bcd15d8a8a89881fbde2bfa919614f6c79f0ecea /cmake/FindZIP.cmake | |
| parent | 231398a3491a2ce87ddf09a1c797d05338519f81 (diff) | |
| parent | 3c63ce46b78a3e106d5648c8d81b8da1a28b03f5 (diff) | |
Merge branch 'master' of ssh://oroborus@repo.or.cz/srv/git/tuxanci
Diffstat (limited to 'cmake/FindZIP.cmake')
| -rw-r--r-- | cmake/FindZIP.cmake | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/cmake/FindZIP.cmake b/cmake/FindZIP.cmake index 4a40e5c..fa76352 100644 --- a/cmake/FindZIP.cmake +++ b/cmake/FindZIP.cmake @@ -6,29 +6,26 @@ # ZIP_FOUND - True if zip found. -IF (ZIP_INCLUDE_DIR) - # Already in cache, be silent - SET(ZIP_FIND_QUIETLY TRUE) -ENDIF (ZIP_INCLUDE_DIR) +IF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) + # Already in cache, be silent + SET(ZIP_FIND_QUIETLY TRUE) +ELSE(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) + FIND_PATH(ZIP_INCLUDE_DIR zip.h) -FIND_PATH(ZIP_INCLUDE_DIR zip.h) + SET(ZIP_NAMES zip) + FIND_LIBRARY(ZIP_LIBRARIES NAMES ${ZIP_NAMES}) -SET(ZIP_NAMES zip) -FIND_LIBRARY(ZIP_LIBRARY NAMES ${ZIP_NAMES} ) + # handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARIES ZIP_INCLUDE_DIR) -# handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARY ZIP_INCLUDE_DIR) - -IF(ZIP_FOUND) - SET( ZIP_LIBRARIES ${ZIP_LIBRARY} ) -ELSE(ZIP_FOUND) - SET(ZIP_FOUND FALSE) - IF (ZIP_REQUIRED) - MESSAGE(FATAL_ERROR "libzip not found") - ENDIF (ZIP_REQUIRED) - SET( ZIP_LIBRARIES ) -ENDIF(ZIP_FOUND) + IF(NOT ZIP_FOUND) + IF(ZIP_REQUIRED) + MESSAGE(FATAL_ERROR "libzip not found") + ENDIF(ZIP_REQUIRED) + SET(ZIP_LIBRARIES) + ENDIF(NOT ZIP_FOUND) +ENDIF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) MARK_AS_ADVANCED( ZIP_LIBRARY ZIP_INCLUDE_DIR ) |