From 595e61647a1feeca9c1927a4f45a4bb62384f8e0 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Feb 17 2017 21:34:05 +0000 Subject: Drop minizip dir from includes There's a few different crypt.h's, and perl tries to include so other crypt.h, leading to trouble. Let's refer to minizip/crypt.h using a full path. --- diff --git a/libsbml-use-system-minizip-cmake.patch b/libsbml-use-system-minizip-cmake.patch index f0f3c9f..6f9837c 100644 --- a/libsbml-use-system-minizip-cmake.patch +++ b/libsbml-use-system-minizip-cmake.patch @@ -34,8 +34,21 @@ index f9406186c9..e8f277edcf 100644 - include_directories(${LIBZ_INCLUDE_DIR}) - set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY}) -+ include_directories(${LIBZ_INCLUDE_DIR} ${MINIZIP_INCLUDE_DIRS}) ++ include_directories(${LIBZ_INCLUDE_DIR}) + set(LIBSBML_LIBS ${LIBSBML_LIBS} ${LIBZ_LIBRARY} ${MINIZIP_LIBRARIES}) endif() +--- libSBML-5.14.0-Source/src/sbml/compress/zipfstream.h~ 2016-09-13 09:23:03.000000000 -0400 ++++ libSBML-5.14.0-Source/src/sbml/compress/zipfstream.h 2017-02-17 16:31:16.436270708 -0500 +@@ -66,8 +66,8 @@ + + #include // not iostream, since we don't need cin/cout + #include +-#include "zip.h" +-#include "unzip.h" ++#include "minizip/zip.h" ++#include "minizip/unzip.h" + + /*****************************************************************************/ +