SecBSD's official ports repository
This commit is contained in:
commit
2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
49
textproc/ebook-tools/patches/patch-cmake_FindLibZip_cmake
Normal file
49
textproc/ebook-tools/patches/patch-cmake_FindLibZip_cmake
Normal file
|
@ -0,0 +1,49 @@
|
|||
--- cmake/FindLibZip.cmake.orig Sun Apr 6 19:16:33 2008
|
||||
+++ cmake/FindLibZip.cmake Fri Dec 23 12:19:54 2011
|
||||
@@ -2,35 +2,29 @@
|
||||
# Once done this will define
|
||||
#
|
||||
# LIBZIP_FOUND - system has the zip library
|
||||
-# LIBZIP_INCLUDE_DIR - the zip include directory
|
||||
-# LIBZIP_LIBRARY - Link this to use the zip library
|
||||
+# LIBZIP_INCLUDE_DIRS - the zip include directory
|
||||
+# LIBZIP_LIBRARIES - Link this to use the zip library
|
||||
#
|
||||
# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
-if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
||||
+if (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
set(LIBZIP_FOUND TRUE)
|
||||
-else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
||||
+else (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
||||
|
||||
- find_path(LIBZIP_INCLUDE_DIR zip.h
|
||||
- ${GNUWIN32_DIR}/include
|
||||
- )
|
||||
+ INCLUDE(FindPkgConfig)
|
||||
+ pkg_check_modules(LIBZIP REQUIRED libzip)
|
||||
|
||||
- find_library(LIBZIP_LIBRARY NAMES zip
|
||||
- PATHS
|
||||
- ${GNUWIN32_DIR}/lib
|
||||
- )
|
||||
-
|
||||
include(FindPackageHandleStandardArgs)
|
||||
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
|
||||
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARIES LIBZIP_INCLUDE_DIRS)
|
||||
|
||||
# ensure that they are cached
|
||||
- set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
|
||||
- set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
|
||||
+ set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include path")
|
||||
+ set(LIBZIP_LIBRARIES ${LIBZIP_LIBRARIES} CACHE INTERNAL "The libraries needed to use libzip")
|
||||
|
||||
-endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
|
||||
+endif (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
|
||||
|
||||
-mark_as_advanced(LIBZIP_INCLUDE_DIR LIBZIP_LIBRARY)
|
||||
+mark_as_advanced(LIBZIP_INCLUDE_DIRS LIBZIP_LIBRARIES)
|
Loading…
Add table
Add a link
Reference in a new issue