luo980/miniz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #164 from otreblan/master

Browse Source 
Add pkg-config file and remove hardcoded install dirs
This commit is contained in:
Martin Raiber 2020-09-16 14:20:35 +02:00 committed by GitHub
commit 5ebed82882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -7,6 +7,7 @@ else()
project(miniz C) project(miniz C)
endif() endif()
include(GNUInstallDirs)
set(MINIZ_API_VERSION 2) set(MINIZ_API_VERSION 2)
set(MINIZ_MINOR_VERSION 1) set(MINIZ_MINOR_VERSION 1)
@ -121,6 +122,13 @@ endif(AMALGAMATE_SOURCES)
if(NOT BUILD_HEADER_ONLY) if(NOT BUILD_HEADER_ONLY)
target_compile_definitions(${PROJECT_NAME} target_compile_definitions(${PROJECT_NAME}
PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>) PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)
# pkg-config file
configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY)
install(FILES
${CMAKE_BINARY_DIR}/miniz.pc
DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
endif() endif()
set_property(TARGET ${PROJECT_NAME} PROPERTY set_property(TARGET ${PROJECT_NAME} PROPERTY
@ -130,11 +138,11 @@ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
) )
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
# users can use <miniz.h> or <miniz/miniz.h> # users can use <miniz.h> or <miniz/miniz.h>
INCLUDES DESTINATION include include/${PROJECT_NAME} INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
) )
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
@ -153,7 +161,7 @@ configure_file(Config.cmake.in
@ONLY @ONLY
) )
set(ConfigPackageLocation lib/cmake/${PROJECT_NAME}) set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
install(EXPORT ${PROJECT_NAME}Targets install(EXPORT ${PROJECT_NAME}Targets
FILE FILE
${PROJECT_NAME}Targets.cmake ${PROJECT_NAME}Targets.cmake
@ -222,6 +230,6 @@ endif()
set(INCLUDE_INSTALL_DIR "include") set(INCLUDE_INSTALL_DIR "include")
install(FILES ${INSTALL_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}) install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})

13
miniz.pc.in Normal file
View File

@ -0,0 +1,13 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@
Version: @MINIZ_VERSION@
URL: @PROJECT_HOMEPAGE_URL@
Requires:
Libs: -L${libdir} -lminiz
Cflags: -I${includedir}