Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 1 | From fbb13cdb0b3591616c3f77b6bc76e75af8906cda Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 19 Mar 2022 22:59:58 -0700 |
| 4 | Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs |
| 5 | |
| 6 | makes it portable across platforms e.g. ppc64/linux uses usr/lib64 for |
| 7 | system libs |
| 8 | |
| 9 | Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/344] |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | CMakeLists.txt | 8 +++++--- |
| 13 | 1 file changed, 5 insertions(+), 3 deletions(-) |
| 14 | |
| 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 16 | index 4f28ee4..8150f5c 100644 |
| 17 | --- a/CMakeLists.txt |
| 18 | +++ b/CMakeLists.txt |
| 19 | @@ -239,10 +239,12 @@ if(REDIS_PLUS_PLUS_BUILD_TEST) |
| 20 | add_subdirectory(test) |
| 21 | endif() |
| 22 | |
| 23 | +include(GNUInstallDirs) |
| 24 | + |
| 25 | install(TARGETS ${REDIS_PLUS_PLUS_TARGETS} |
| 26 | EXPORT redis++-targets |
| 27 | - LIBRARY DESTINATION lib |
| 28 | - ARCHIVE DESTINATION lib |
| 29 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 30 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 31 | RUNTIME DESTINATION bin |
| 32 | INCLUDES DESTINATION include) |
| 33 | |
| 34 | @@ -284,7 +286,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in" |
| 35 | "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY) |
| 36 | |
| 37 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" |
| 38 | - DESTINATION "lib/pkgconfig") |
| 39 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") |
| 40 | |
| 41 | # All the Debian-specific cpack defines. |
| 42 | if(${CMAKE_VERSION} VERSION_GREATER 3.6) |
| 43 | -- |
| 44 | 2.35.1 |
| 45 | |