- release 5 (by relup.sh)

[packages/ebook-tools.git] / findlibzip.patch

--- ebook-tools-0.2.2/cmake/FindLibZip.cmake.orig	2015-03-09 17:37:02.000000000 +0000
+++ ebook-tools-0.2.2/cmake/FindLibZip.cmake	2015-03-09 17:48:51.000000000 +0000
@@ -15,9 +15,11 @@ if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DI
   set(LIBZIP_FOUND TRUE)
 else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
 
-  find_path(LIBZIP_INCLUDE_DIR zip.h
-    ${GNUWIN32_DIR}/include
-  )
+  pkg_check_modules(LIBZIP REQUIRED libzip)
+
+#  find_path(LIBZIP_INCLUDE_DIR zip.h
+#    ${GNUWIN32_DIR}/include
+# )
 
   find_library(LIBZIP_LIBRARY NAMES zip
     PATHS
@@ -25,10 +27,10 @@ else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_
   )
 
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIRS)
 
     # ensure that they are cached
-    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
+    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include path")
     set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
 
 endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)