diff --git libSBML-5.11.0-Source/CMakeLists.txt~ libSBML-5.11.0-Source/CMakeLists.txt index 14bf5cc5bb..85229454e9 100644 --- libSBML-5.11.0-Source/CMakeLists.txt~ +++ libSBML-5.11.0-Source/CMakeLists.txt @@ -638,6 +638,8 @@ ${LIBSBML_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log") 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) diff --git libSBML-5.11.0-Source/src/CMakeLists.txt~ libSBML-5.11.0-Source/src/CMakeLists.txt index f9406186c9..e8f277edcf 100644 --- libSBML-5.11.0-Source/src/CMakeLists.txt~ +++ libSBML-5.11.0-Source/src/CMakeLists.txt @@ -349,12 +349,6 @@ endif() 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/zfstream.h sbml/compress/zfstream.cpp sbml/compress/zipfstream.cpp @@ -373,8 +367,8 @@ set(COMPRESS_SOURCES ${COMPRESS_SOURCES} ) endif() - include_directories(${LIBZ_INCLUDE_DIR}) - set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY}) + include_directories(${LIBZ_INCLUDE_DIR} ${MINIZIP_INCLUDE_DIRS}) + set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY} ${MINIZIP_LIBRARIES}) endif()