| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ruslan Bilovol <rbilovol@cisco.com> |
| 3 | Date: Thu, 24 Jan 2019 18:11:39 +0200 |
| 4 | Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path |
| 5 | |
| 6 | Currently this path is hardcoded to lib/cmake. |
| 7 | Some distributions have different library path (like lib64). |
| 8 | So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR |
| 9 | configurable and usable in such distros. |
| 10 | |
| 11 | Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9] |
| 12 | |
| 13 | Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> |
| 14 | --- |
| 15 | CMakeLists.txt | 4 ++-- |
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 19 | index 7c60407..0275672 100644 |
| 20 | --- a/CMakeLists.txt |
| 21 | +++ b/CMakeLists.txt |
| 22 | @@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in |
| 23 | ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY) |
| 24 | |
| 25 | # ... for the install tree |
| 26 | -SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} ) |
| 27 | +SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) |
| 28 | FILE( RELATIVE_PATH REL_INCLUDE_DIR |
| 29 | - "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" |
| 30 | + "${CMAKECONFIG_INSTALL_DIR}" |
| 31 | "${CMAKE_INSTALL_PREFIX}/include" ) |
| 32 | |
| 33 | SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) |
| 34 | -- |
| 35 | 1.9.1 |
| 36 | |