|
| 1 | +From 02c781a35a844f0ef4434268fb0d7f9ea2d3f130 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Andreas Sturmlechner < [email protected]> |
| 3 | +Date: Thu, 26 Mar 2020 13:07:37 +0100 |
| 4 | +Subject: [PATCH] Use GNUInstallDirs |
| 5 | + |
| 6 | +Fix cmake module install path while at it. |
| 7 | +Fix pkgconfig libdir path while at it. |
| 8 | +--- |
| 9 | + CMakeLists.txt | 15 +++++++-------- |
| 10 | + RinutilsConfig.cmake.in | 2 +- |
| 11 | + librinutils.pc.in | 4 ++-- |
| 12 | + 3 files changed, 10 insertions(+), 11 deletions(-) |
| 13 | + |
| 14 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | +index 9829c49..753a138 100644 |
| 16 | +--- a/CMakeLists.txt |
| 17 | ++++ b/CMakeLists.txt |
| 18 | +@@ -9,6 +9,7 @@ option (WITH_TEST_SUITE "Also build and run the test suite." ON) |
| 19 | + option (DISABLE_APPLYING_RPATH "Disable applying rpath") |
| 20 | + |
| 21 | + INCLUDE(FindPkgConfig) |
| 22 | ++INCLUDE(GNUInstallDirs) |
| 23 | + |
| 24 | + # Introduces VERSION , CPACK_PACKAGE_VERSION_MAJOR, |
| 25 | + # CPACK_PACKAGE_VERSION_MAJOR, and CPACK_PACKAGE_VERSION_PATCH |
| 26 | +@@ -54,7 +55,7 @@ IF (NOT DISABLE_APPLYING_RPATH) |
| 27 | + SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
| 28 | + |
| 29 | + # the RPATH to be used when installing |
| 30 | +- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") |
| 31 | ++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") |
| 32 | + |
| 33 | + # add the automatically determined parts of the RPATH |
| 34 | + # which point to directories outside the build tree to the install RPATH |
| 35 | +@@ -99,14 +100,14 @@ INSTALL( |
| 36 | + "rinutils/include/rinutils/typeof_wrap.h" |
| 37 | + "rinutils/include/rinutils/unused.h" |
| 38 | + DESTINATION |
| 39 | +- "include/rinutils" |
| 40 | ++ "${CMAKE_INSTALL_INCLUDEDIR}/rinutils" |
| 41 | + ) |
| 42 | + |
| 43 | + INSTALL( |
| 44 | + FILES |
| 45 | + "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc" |
| 46 | + DESTINATION |
| 47 | +- "lib${LIB_SUFFIX}/pkgconfig" |
| 48 | ++ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" |
| 49 | + ) |
| 50 | + |
| 51 | + CONFIGURE_FILE( |
| 52 | +@@ -128,20 +129,18 @@ ADD_CUSTOM_COMMAND( |
| 53 | + ARGS "config.h.in" |
| 54 | + ) |
| 55 | + |
| 56 | +-set(INCLUDE_INSTALL_DIR include) |
| 57 | +-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}") |
| 58 | + include(CMakePackageConfigHelpers) |
| 59 | + configure_package_config_file(RinutilsConfig.cmake.in |
| 60 | + ${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfig.cmake |
| 61 | +- INSTALL_DESTINATION ${LIB_INSTALL_DIR}/Rinutils/cmake |
| 62 | +- PATH_VARS INCLUDE_INSTALL_DIR) |
| 63 | ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Rinutils |
| 64 | ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR) |
| 65 | + write_basic_package_version_file( |
| 66 | + ${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfigVersion.cmake |
| 67 | + VERSION 1.2.3 |
| 68 | + COMPATIBILITY SameMajorVersion ) |
| 69 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfig.cmake |
| 70 | + ${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfigVersion.cmake |
| 71 | +- DESTINATION ${LIB_INSTALL_DIR}/Rinutils/cmake ) |
| 72 | ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Rinutils ) |
| 73 | + |
| 74 | + IF (WITH_TEST_SUITE) |
| 75 | + |
| 76 | +diff --git a/RinutilsConfig.cmake.in b/RinutilsConfig.cmake.in |
| 77 | +index 480fda0..f81f685 100644 |
| 78 | +--- a/RinutilsConfig.cmake.in |
| 79 | ++++ b/RinutilsConfig.cmake.in |
| 80 | +@@ -2,6 +2,6 @@ set(RINUTILS_VERSION x.y.z) |
| 81 | + |
| 82 | + @PACKAGE_INIT@ |
| 83 | + |
| 84 | +-set_and_check(RINUTILS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") |
| 85 | ++set_and_check(RINUTILS_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") |
| 86 | + |
| 87 | + check_required_components(Rinutils) |
| 88 | +diff --git a/librinutils.pc.in b/librinutils.pc.in |
| 89 | +index 6cdb514..1af6238 100644 |
| 90 | +--- a/librinutils.pc.in |
| 91 | ++++ b/librinutils.pc.in |
| 92 | +@@ -1,7 +1,7 @@ |
| 93 | + prefix="@CMAKE_INSTALL_PREFIX@" |
| 94 | + exec_prefix=${prefix} |
| 95 | +-libdir=${exec_prefix}/lib |
| 96 | +-includedir=${prefix}/include |
| 97 | ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
| 98 | ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ |
| 99 | + |
| 100 | + Name: rinutils |
| 101 | + Description: Ad hoc headers library for C |
| 102 | +-- |
| 103 | +2.26.0 |
| 104 | + |
0 commit comments