Blob Blame History Raw
--- CMakeLists.orig.txt	2017-03-15 13:01:27.623725000 +0100
+++ CMakeLists.txt	2017-03-15 14:12:22.247705049 +0100
@@ -696,6 +696,8 @@
 valid. It should contain the file zlib.h, but it does not.")
     endif()
 
+    find_package(PkgConfig)
+    pkg_check_modules(MINIZIP REQUIRED minizip)
 endif(WITH_ZLIB)
 
 
--- src/CMakeLists.orig.txt	2017-03-15 13:01:26.507732000 +0100
+++ src/CMakeLists.txt	2017-03-15 14:15:49.173159496 +0100
@@ -354,14 +354,6 @@
 if(WITH_ZLIB)
 
 set(COMPRESS_SOURCES ${COMPRESS_SOURCES}
-        sbml/compress/zip.c
-        sbml/compress/zip.h
-        sbml/compress/unzip.h
-        sbml/compress/unzip.c
-        sbml/compress/ioapi.h
-        sbml/compress/ioapi.c
-        sbml/compress/ioapi_mem.h
-        sbml/compress/ioapi_mem.c
         sbml/compress/zfstream.h
         sbml/compress/zfstream.cpp
         sbml/compress/zipfstream.cpp
@@ -381,7 +373,7 @@
     endif()
 
     include_directories(${LIBZ_INCLUDE_DIR})
-    set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY})
+    set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY} ${MINIZIP_LIBRARIES})
 
 endif()
 
--- src/sbml/compress/zipfstream.orig.h	2017-03-15 13:01:25.633738000 +0100
+++ src/sbml/compress/zipfstream.h	2017-03-15 14:18:08.254792811 +0100
@@ -66,8 +66,8 @@
 
 #include <istream>  // not iostream, since we don't need cin/cout
 #include <ostream>
-#include "zip.h"
-#include "unzip.h"
+#include "minizip/zip.h"
+#include "minizip/unzip.h"
 
 /*****************************************************************************/