diff options
| author | Treeve Jelbert | 2020-11-25 13:18:56 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-26 08:34:12 +0100 |
| commit | 6050dacbc105334c7dbd2704a8a68273aac4df38 (patch) | |
| tree | c5ef20146f5b5290488be41ea4a02004a41016c1 /doc | |
| parent | c2d8cbac68dd9da5ab564a015f7ae1e008c14578 (diff) | |
ebook-tools - fix build
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ebook-tools/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | doc/ebook-tools/HISTORY | 6 | ||||
| -rwxr-xr-x | doc/ebook-tools/PRE_BUILD | 4 | ||||
| -rw-r--r-- | doc/ebook-tools/cm.diff | 13 |
4 files changed, 17 insertions, 14 deletions
diff --git a/doc/ebook-tools/CMakeLists.txt b/doc/ebook-tools/CMakeLists.txt new file mode 100644 index 0000000000..382a6aec3b --- /dev/null +++ b/doc/ebook-tools/CMakeLists.txt @@ -0,0 +1,8 @@ +include_directories( . ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR}) +add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c) +target_link_libraries (epub libzip::zip ${LIBXML2_LIBRARIES}) + +set_target_properties (epub PROPERTIES VERSION 0.2.2 SOVERSION 0) + +install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ) +install ( FILES epub.h epub_shared.h epub_version.h DESTINATION include ) diff --git a/doc/ebook-tools/HISTORY b/doc/ebook-tools/HISTORY index 764f427f0c..f71c035900 100644 --- a/doc/ebook-tools/HISTORY +++ b/doc/ebook-tools/HISTORY @@ -1,3 +1,9 @@ +2020-11-25 Treeve Jelbert <treeve@sourcemage.org> + * cm.diff: deleted + * PRE_BUILD: adjusted + * CMakeLists.txt: added + fix build + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/doc/ebook-tools/PRE_BUILD b/doc/ebook-tools/PRE_BUILD index 8d5f7a4ff3..94ad4810c2 100755 --- a/doc/ebook-tools/PRE_BUILD +++ b/doc/ebook-tools/PRE_BUILD @@ -1,3 +1,5 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p1 < $SPELL_DIRECTORY/cm.diff +rm cmake/Find* && +sed -i 's/LibZip/libzip 1.7.3/;s/2.4.0/3.15.0/' CMakeLists.txt && +cp $SPELL_DIRECTORY/CMakeLists.txt src/libepub diff --git a/doc/ebook-tools/cm.diff b/doc/ebook-tools/cm.diff deleted file mode 100644 index 88d8119469..0000000000 --- a/doc/ebook-tools/cm.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr ebook-tools-0.2.1.orig/cmake/FindLibZip.cmake ebook-tools-0.2.1/cmake/FindLibZip.cmake ---- ebook-tools-0.2.1.orig/cmake/FindLibZip.cmake 2008-04-06 19:16:33.000000000 +0200 -+++ ebook-tools-0.2.1/cmake/FindLibZip.cmake 2012-03-30 12:39:59.000000000 +0200 -@@ -28,7 +28,8 @@ - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR) - - # ensure that they are cached -- set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path") -+ set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} /usr/lib/libzip/include 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) |