Andrew Geissler | d159c7f | 2021-09-02 21:05:58 -0500 | [diff] [blame^] | 1 | From 329e27c8ad30e76ab50c7949cc95ba8eb0efabd2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Anton Blanchard <anton@ozlabs.org> |
| 3 | Date: Tue, 17 Aug 2021 09:53:41 +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/CPPAlliance/url/pull/38] |
| 9 | --- |
| 10 | CMakeLists.txt | 10 ++++++---- |
| 11 | 1 file changed, 6 insertions(+), 4 deletions(-) |
| 12 | |
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index 5b53f31..ebb7346 100644 |
| 15 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt |
| 17 | @@ -109,20 +109,22 @@ else() |
| 18 | endif() |
| 19 | |
| 20 | if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST_TREE) |
| 21 | + include(GNUInstallDirs) |
| 22 | + |
| 23 | set_target_properties(boost_url PROPERTIES EXPORT_NAME url) |
| 24 | install(TARGETS boost_url EXPORT boost_url_targets) |
| 25 | |
| 26 | install(EXPORT boost_url_targets |
| 27 | FILE boost_url-targets.cmake |
| 28 | NAMESPACE Boost:: |
| 29 | - DESTINATION lib/cmake/boost_url |
| 30 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url |
| 31 | ) |
| 32 | |
| 33 | include(CMakePackageConfigHelpers) |
| 34 | |
| 35 | configure_package_config_file(cmake/config.cmake.in |
| 36 | ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake |
| 37 | - INSTALL_DESTINATION lib/cmake/boost_url |
| 38 | + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url |
| 39 | ) |
| 40 | |
| 41 | write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake |
| 42 | @@ -132,10 +134,10 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST |
| 43 | install(FILES |
| 44 | ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake |
| 45 | ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake |
| 46 | - DESTINATION lib/cmake/boost_url |
| 47 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url |
| 48 | ) |
| 49 | |
| 50 | - install(DIRECTORY include/ DESTINATION include) |
| 51 | + install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| 52 | endif() |
| 53 | |
| 54 | if(BOOST_URL_BUILD_TESTS) |
| 55 | -- |
| 56 | 2.31.1 |
| 57 | |