| Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame^] | 1 | From e66885e66a2ce7fd916933b12d1ba523a25141e4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 3 Oct 2022 13:25:05 +0100 |
| 4 | Subject: [PATCH] Honour multilib paths |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 8 | --- |
| 9 | CMakeLists.txt | 14 +++++++------- |
| 10 | 1 file changed, 7 insertions(+), 7 deletions(-) |
| 11 | |
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 13 | index 39b9ad365f78..bf297e936a72 100644 |
| 14 | --- a/CMakeLists.txt |
| 15 | +++ b/CMakeLists.txt |
| 16 | @@ -20,8 +20,8 @@ endif () |
| 17 | |
| 18 | # Set some nicer output dirs. |
| 19 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) |
| 20 | -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) |
| 21 | -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) |
| 22 | +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) |
| 23 | +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) |
| 24 | set(JANSSON_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp) |
| 25 | |
| 26 | # Give the debug version a different postfix for windows, |
| 27 | @@ -573,14 +573,14 @@ endif () |
| 28 | # |
| 29 | |
| 30 | # Allow the user to override installation directories. |
| 31 | -set(JANSSON_INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") |
| 32 | +set(JANSSON_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") |
| 33 | set(JANSSON_INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables") |
| 34 | set(JANSSON_INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") |
| 35 | |
| 36 | if(WIN32 AND NOT CYGWIN) |
| 37 | set(DEF_INSTALL_CMAKE_DIR cmake) |
| 38 | else() |
| 39 | - set(DEF_INSTALL_CMAKE_DIR lib/cmake/jansson) |
| 40 | + set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/jansson) |
| 41 | endif() |
| 42 | |
| 43 | set(JANSSON_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") |
| 44 | @@ -633,8 +633,8 @@ option(JANSSON_INSTALL "Generate installation target" ON) |
| 45 | if (JANSSON_INSTALL) |
| 46 | install(TARGETS jansson |
| 47 | EXPORT janssonTargets |
| 48 | - LIBRARY DESTINATION "lib" |
| 49 | - ARCHIVE DESTINATION "lib" |
| 50 | + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" |
| 51 | + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" |
| 52 | RUNTIME DESTINATION "bin" |
| 53 | INCLUDES DESTINATION "include") |
| 54 | |
| 55 | @@ -644,7 +644,7 @@ if (JANSSON_INSTALL) |
| 56 | # Install the pkg-config. |
| 57 | install(FILES |
| 58 | ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc |
| 59 | - DESTINATION lib/pkgconfig) |
| 60 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
| 61 | |
| 62 | # Install the configs. |
| 63 | install(FILES |