From 320764e3cad4b71c5980f995d2987bb63cbc7d0a Mon Sep 17 00:00:00 2001 From: otreblan Date: Mon, 14 Sep 2020 11:46:49 -0500 Subject: [PATCH 1/3] Add pkg-config file --- CMakeLists.txt | 7 +++++++ miniz.pc.in | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 miniz.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index d2d3811..ffc604b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,13 @@ endif(AMALGAMATE_SOURCES) if(NOT BUILD_HEADER_ONLY) target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:_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() set_property(TARGET ${PROJECT_NAME} PROPERTY diff --git a/miniz.pc.in b/miniz.pc.in new file mode 100644 index 0000000..43be7f9 --- /dev/null +++ b/miniz.pc.in @@ -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: @PROJECT_VERSION@ +URL: @PROJECT_HOMEPAGE_URL@ + +Requires: +Libs: -L${libdir} -lminiz +Cflags: -I${includedir} From 65ad3cdf66cd4aa80733d07d6acc0642fdf4c6e4 Mon Sep 17 00:00:00 2001 From: otreblan Date: Mon, 14 Sep 2020 11:56:38 -0500 Subject: [PATCH 2/3] Remove hardcoded install dirs --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffc604b..69feef9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ else() project(miniz C) endif() +include(GNUInstallDirs) set(MINIZ_API_VERSION 2) set(MINIZ_MINOR_VERSION 1) @@ -137,11 +138,11 @@ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY ) install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # users can use or - INCLUDES DESTINATION include include/${PROJECT_NAME} + INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ) include(CMakePackageConfigHelpers) @@ -160,7 +161,7 @@ configure_file(Config.cmake.in @ONLY ) -set(ConfigPackageLocation lib/cmake/${PROJECT_NAME}) +set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) install(EXPORT ${PROJECT_NAME}Targets FILE ${PROJECT_NAME}Targets.cmake @@ -229,6 +230,6 @@ endif() 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}) From e6faac98813160daa065fdd5d72d48e3d1cb6888 Mon Sep 17 00:00:00 2001 From: otreblan Date: Mon, 14 Sep 2020 11:59:07 -0500 Subject: [PATCH 3/3] Use MINIZ_VERSION for the pkg-config version --- miniz.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniz.pc.in b/miniz.pc.in index 43be7f9..95faf5f 100644 --- a/miniz.pc.in +++ b/miniz.pc.in @@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ -Version: @PROJECT_VERSION@ +Version: @MINIZ_VERSION@ URL: @PROJECT_HOMEPAGE_URL@ Requires: