diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-05 17:17:38 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-05 17:17:38 +0100 |
| commit | 8d2c9b07b33ee43ffac2563c24aaa939a9eb6995 (patch) | |
| tree | 69f6b57e571887ff640a686709aa1e812f0f62f8 | |
| parent | edff59279f6c25855a9d01769699ca0ffcfa4166 (diff) | |
libzip first pass.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/FindZIP.cmake (renamed from cmake/FindZZIP.cmake) | 4 | ||||
| -rw-r--r-- | src/base/archive.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a2235b0..7cfc546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,9 +131,9 @@ ENDIF ( Apple ) ############################################################################### # LIBS SEARCH ############################################################################### -MESSAGE ( STATUS "<Locating ZZIP library>" ) +MESSAGE ( STATUS "<Locating ZIP library>" ) MESSAGE ( STATUS "<******************************>" ) -FIND_PACKAGE ( ZZIP REQUIRED ) +FIND_PACKAGE ( ZIP REQUIRED ) IF ( WITH_OPENGL ) MESSAGE ( STATUS "<Locating OpenGL stuff>" ) MESSAGE ( STATUS "<******************************>" ) diff --git a/cmake/FindZZIP.cmake b/cmake/FindZIP.cmake index 29dc5ae..0bbdce4 100644 --- a/cmake/FindZZIP.cmake +++ b/cmake/FindZIP.cmake @@ -11,9 +11,9 @@ IF (ZZIP_INCLUDE_DIR) SET(ZZIP_FIND_QUIETLY TRUE) ENDIF (ZZIP_INCLUDE_DIR) -FIND_PATH(ZZIP_INCLUDE_DIR zzip.h) +FIND_PATH(ZZIP_INCLUDE_DIR zip.h) -SET(ZZIP_NAMES zzip) +SET(ZZIP_NAMES zip) FIND_LIBRARY(ZZIP_LIBRARY NAMES ${ZZIP_NAMES} ) # handle the QUIETLY and REQUIRED arguments and set ZZIP_FOUND to TRUE if diff --git a/src/base/archive.c b/src/base/archive.c index f851a86..0866d2b 100644 --- a/src/base/archive.c +++ b/src/base/archive.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <zzip/zzip.h> +#include <zip.h> #include "archive.h" |