From 65ad3cdf66cd4aa80733d07d6acc0642fdf4c6e4 Mon Sep 17 00:00:00 2001 From: otreblan Date: Mon, 14 Sep 2020 11:56:38 -0500 Subject: [PATCH] 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})