- release 5 (by relup.sh)
[packages/ebook-tools.git] / findlibzip.patch
1 --- ebook-tools-0.2.2/cmake/FindLibZip.cmake.orig       2015-03-09 17:37:02.000000000 +0000
2 +++ ebook-tools-0.2.2/cmake/FindLibZip.cmake    2015-03-09 17:48:51.000000000 +0000
3 @@ -15,9 +15,11 @@ if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DI
4    set(LIBZIP_FOUND TRUE)
5  else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
6  
7 -  find_path(LIBZIP_INCLUDE_DIR zip.h
8 -    ${GNUWIN32_DIR}/include
9 -  )
10 +  pkg_check_modules(LIBZIP REQUIRED libzip)
11 +
12 +#  find_path(LIBZIP_INCLUDE_DIR zip.h
13 +#    ${GNUWIN32_DIR}/include
14 +# )
15  
16    find_library(LIBZIP_LIBRARY NAMES zip
17      PATHS
18 @@ -25,10 +27,10 @@ else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_
19    )
20  
21    include(FindPackageHandleStandardArgs)
22 -  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
23 +  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIRS)
24  
25      # ensure that they are cached
26 -    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
27 +    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include path")
28      set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
29  
30  endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
This page took 0.111387 seconds and 3 git commands to generate.