| Andrew Geissler | d159c7f | 2021-09-02 21:05:58 -0500 | [diff] [blame^] | 1 | From c9e60ed064aa2938f71f2cacf79f0bb337812bf8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Anton Blanchard <anton@ozlabs.org> |
| 3 | Date: Tue, 17 Aug 2021 09:32:43 +1000 |
| 4 | Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories |
| 5 | |
| 6 | On a multilib setup cmake files should go into lib64. |
| 7 | |
| 8 | Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/710] |
| 9 | --- |
| 10 | CMakeLists.txt | 5 +++-- |
| 11 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index b97c1f59..ad574290 100644 |
| 15 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt |
| 17 | @@ -70,14 +70,15 @@ endif() |
| 18 | |
| 19 | option(CEREAL_INSTALL "Generate the install target" ${CEREAL_MASTER_PROJECT}) |
| 20 | if(CEREAL_INSTALL) |
| 21 | + include(GNUInstallDirs) |
| 22 | include(CMakePackageConfigHelpers) |
| 23 | |
| 24 | install(TARGETS cereal EXPORT ${PROJECT_NAME}Targets) |
| 25 | - install(DIRECTORY include/cereal DESTINATION include) |
| 26 | + install(DIRECTORY include/cereal DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| 27 | |
| 28 | set(configFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake) |
| 29 | set(versionFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake) |
| 30 | - set(configInstallDestination lib/cmake/${PROJECT_NAME}) |
| 31 | + set(configInstallDestination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) |
| 32 | |
| 33 | configure_package_config_file( |
| 34 | ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in |
| 35 | -- |
| 36 | 2.31.1 |
| 37 | |