|
 |
57584cf |
diff -up ebook-tools-0.2.1/cmake/FindLibZip.cmake.libzip_pkgconfig ebook-tools-0.2.1/cmake/FindLibZip.cmake
|
|
|
57584cf |
--- ebook-tools-0.2.1/cmake/FindLibZip.cmake.libzip_pkgconfig 2008-04-06 12:16:33.000000000 -0500
|
|
|
57584cf |
+++ ebook-tools-0.2.1/cmake/FindLibZip.cmake 2012-07-10 14:48:32.540578446 -0500
|
|
|
57584cf |
@@ -2,35 +2,55 @@
|
|
|
57584cf |
# Once done this will define
|
|
|
57584cf |
#
|
|
|
57584cf |
# LIBZIP_FOUND - system has the zip library
|
|
|
57584cf |
-# LIBZIP_INCLUDE_DIR - the zip include directory
|
|
|
57584cf |
-# LIBZIP_LIBRARY - Link this to use the zip library
|
|
|
57584cf |
+# LIBZIP_INCLUDE_DIRS - the zip include directories
|
|
|
57584cf |
+# LIBZIP_LIBRARIES - Link this to use the zip library
|
|
|
57584cf |
#
|
|
|
57584cf |
# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
|
|
|
57584cf |
#
|
|
|
57584cf |
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
|
57584cf |
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
|
57584cf |
|
|
|
57584cf |
-if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
|
|
57584cf |
+if (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
|
|
57584cf |
# in cache already
|
|
|
57584cf |
set(LIBZIP_FOUND TRUE)
|
|
|
57584cf |
-else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
|
|
57584cf |
+else (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
|
|
57584cf |
+
|
|
|
57584cf |
+ # use pkg-config to get the directories and then use these values
|
|
|
57584cf |
+ # in the FIND_PATH() and FIND_LIBRARY() calls
|
|
|
57584cf |
+ FIND_PACKAGE(PkgConfig QUIET)
|
|
|
57584cf |
+ PKG_CHECK_MODULES(PC_LIBZIP libzip)
|
|
|
57584cf |
|
|
|
57584cf |
find_path(LIBZIP_INCLUDE_DIR zip.h
|
|
|
57584cf |
+ HINTS
|
|
|
57584cf |
+ ${GNUWIN32_DIR}/include
|
|
|
57584cf |
+ ${PC_LIBZIP_INCLUDEDIR}
|
|
|
57584cf |
+ ${PC_LIBZIP_INCLUDE_DIRS}
|
|
|
57584cf |
+ PATH_SUFFIXES libzip
|
|
|
57584cf |
+ )
|
|
|
57584cf |
+
|
|
|
57584cf |
+ find_path(LIBZIP_LIB_INCLUDE_DIR zipconf.h
|
|
|
57584cf |
+ HINTS
|
|
|
57584cf |
${GNUWIN32_DIR}/include
|
|
|
57584cf |
+ ${PC_LIBZIP_INCLUDEDIR}
|
|
|
57584cf |
+ ${PC_LIBZIP_INCLUDE_DIRS}
|
|
|
57584cf |
+ PATH_SUFFIXES libzip
|
|
|
57584cf |
)
|
|
|
57584cf |
+ set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIR} ${LIBZIP_LIB_INCLUDE_DIR})
|
|
|
57584cf |
|
|
|
57584cf |
- find_library(LIBZIP_LIBRARY NAMES zip
|
|
|
57584cf |
- PATHS
|
|
|
57584cf |
+ find_library(LIBZIP_LIBRARIES NAMES zip
|
|
|
57584cf |
+ HINTS
|
|
|
57584cf |
+ ${PC_LIBZIP_LIBDIR}
|
|
|
57584cf |
+ ${PC_LIBZIP_LIBRARY_DIRS}
|
|
|
57584cf |
${GNUWIN32_DIR}/lib
|
|
|
57584cf |
)
|
|
|
57584cf |
|
|
|
57584cf |
include(FindPackageHandleStandardArgs)
|
|
|
57584cf |
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
|
|
|
57584cf |
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARIES LIBZIP_INCLUDE_DIRS)
|
|
|
57584cf |
|
|
|
57584cf |
# ensure that they are cached
|
|
|
57584cf |
- set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
|
|
|
57584cf |
- set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
|
|
|
57584cf |
+ set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include paths")
|
|
|
57584cf |
+ set(LIBZIP_LIBRARIES ${LIBZIP_LIBRARIES} CACHE INTERNAL "The libraries needed to use libzip")
|
|
|
57584cf |
|
|
|
57584cf |
-endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
|
|
57584cf |
+endif (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
|
|
57584cf |
|
|
|
57584cf |
-mark_as_advanced(LIBZIP_INCLUDE_DIR LIBZIP_LIBRARY)
|
|
|
57584cf |
+mark_as_advanced(LIBZIP_INCLUDE_DIRS LIBZIP_LIBRARIES)
|
|
|
57584cf |
diff -up ebook-tools-0.2.1/src/libepub/CMakeLists.txt.libzip_pkgconfig ebook-tools-0.2.1/src/libepub/CMakeLists.txt
|
|
|
57584cf |
--- ebook-tools-0.2.1/src/libepub/CMakeLists.txt.libzip_pkgconfig 2012-07-10 14:32:58.356257360 -0500
|
|
|
57584cf |
+++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt 2012-07-10 14:32:58.359257323 -0500
|
|
|
57584cf |
@@ -1,6 +1,6 @@
|
|
|
57584cf |
-include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
|
|
|
57584cf |
+include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIRS})
|
|
|
57584cf |
add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c)
|
|
|
57584cf |
-target_link_libraries (epub ${LIBZIP_LIBRARY} ${LIBXML2_LIBRARIES})
|
|
|
57584cf |
+target_link_libraries (epub ${LIBZIP_LIBRARIES} ${LIBXML2_LIBRARIES})
|
|
|
57584cf |
|
|
|
57584cf |
set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
|
|
|
57584cf |
|