c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pkgconfig file for private dependencies

Browse Source
This commit is contained in:
Leander Schulten 2023-09-05 22:15:01 +02:00 committed by Nathan Moinvaziri
parent 21606891ab
commit 7cb316f28b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -128,6 +128,7 @@ set(MINIZIP_HDR
mz_zip_rw.h) mz_zip_rw.h)
set(PC_PRIVATE_LIBS) set(PC_PRIVATE_LIBS)
set(PC_PRIVATE_DEPS)
# Check for system includes # Check for system includes
check_include_file(stdint.h HAVE_STDINT_H) check_include_file(stdint.h HAVE_STDINT_H)
@ -184,7 +185,7 @@ if(MZ_ZLIB)
list(APPEND MINIZIP_LIB ${ZLIBNG_LIBRARIES}) list(APPEND MINIZIP_LIB ${ZLIBNG_LIBRARIES})
list(APPEND MINIZIP_LBD ${ZLIBNG_LIBRARY_DIRS}) list(APPEND MINIZIP_LBD ${ZLIBNG_LIBRARY_DIRS})
set(PC_PRIVATE_LIBS " -lz-ng") set(PC_PRIVATE_DEPS "zlib-ng")
set(ZLIB_COMPAT OFF) set(ZLIB_COMPAT OFF)
elseif(ZLIB_FOUND AND NOT MZ_FORCE_FETCH_LIBS) elseif(ZLIB_FOUND AND NOT MZ_FORCE_FETCH_LIBS)
message(STATUS "Using ZLIB ${ZLIB_VERSION}") message(STATUS "Using ZLIB ${ZLIB_VERSION}")
@ -193,7 +194,7 @@ if(MZ_ZLIB)
list(APPEND MINIZIP_LIB ${ZLIB_LIBRARIES}) list(APPEND MINIZIP_LIB ${ZLIB_LIBRARIES})
list(APPEND MINIZIP_LBD ${ZLIB_LIBRARY_DIRS}) list(APPEND MINIZIP_LBD ${ZLIB_LIBRARY_DIRS})
set(PC_PRIVATE_LIBS " -lz") set(PC_PRIVATE_DEPS "zlib")
set(ZLIB_COMPAT ON) set(ZLIB_COMPAT ON)
elseif(MZ_FETCH_LIBS) elseif(MZ_FETCH_LIBS)
clone_repo(zlib https://github.com/madler/zlib) clone_repo(zlib https://github.com/madler/zlib)

2
minizip.pc.cmakein
View File

@ -8,7 +8,7 @@ Name: @MINIZIP_TARGET@
Description: Zip manipulation library Description: Zip manipulation library
Version: @VERSION@ Version: @VERSION@
Requires: zlib Requires.private: @PC_PRIVATE_DEPS@
Libs: -L${libdir} -L${sharedlibdir} -l@MINIZIP_TARGET@ Libs: -L${libdir} -L${sharedlibdir} -l@MINIZIP_TARGET@
Libs.private:@PC_PRIVATE_LIBS@ Libs.private:@PC_PRIVATE_LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}