diff --git a/CMakeLists.txt b/CMakeLists.txt index 0841dbe..54077f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ if(NOT BUILD_HEADER_ONLY) if(INSTALL_PROJECT) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc - DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() endif() @@ -173,13 +173,17 @@ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION ) +set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) + if(INSTALL_PROJECT) + set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # users can use or - INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + INCLUDES DESTINATION include ${MINIZ_INCLUDE_DIR} ) include(CMakePackageConfigHelpers) diff --git a/miniz.pc.in b/miniz.pc.in index 95faf5f..277dfcc 100644 --- a/miniz.pc.in +++ b/miniz.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +includedir=${prefix}/@MINIZ_INCLUDE_DIR@ Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cc4ef34..67c42a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,8 @@ else(AMALGAMATE_SOURCES) INSTALL_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h) endif(AMALGAMATE_SOURCES) +set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) + if(NOT BUILD_HEADER_ONLY) target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:_GNU_SOURCE>) @@ -173,8 +175,6 @@ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION ) -set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) - if(INSTALL_PROJECT) set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})