From fbb13cdb0b3591616c3f77b6bc76e75af8906cda Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 19 Mar 2022 22:59:58 -0700 Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs makes it portable across platforms e.g. ppc64/linux uses usr/lib64 for system libs Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/344] Signed-off-by: Khem Raj --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f28ee4..8150f5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,10 +239,12 @@ if(REDIS_PLUS_PLUS_BUILD_TEST) add_subdirectory(test) endif() +include(GNUInstallDirs) + install(TARGETS ${REDIS_PLUS_PLUS_TARGETS} EXPORT redis++-targets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin INCLUDES DESTINATION include) @@ -284,7 +286,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" - DESTINATION "lib/pkgconfig") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") # All the Debian-specific cpack defines. if(${CMAKE_VERSION} VERSION_GREATER 3.6) -- 2.35.1