Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From a07e56e1a2e70a9b81eb0a65f345cf45a7a93a81 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 19 Dec 2019 21:56:23 -0800 |
| 4 | Subject: [PATCH] DefineInstallationPaths.cmake: Define libdir in terms of |
| 5 | LIB_SUFFIX |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | build/cmake/DefineInstallationPaths.cmake | 2 +- |
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | |
| 13 | --- a/build/cmake/DefineInstallationPaths.cmake |
| 14 | +++ b/build/cmake/DefineInstallationPaths.cmake |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 15 | @@ -26,11 +26,11 @@ |
| 16 | set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") |
| 17 | endif() |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 18 | set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The library install dir (default: include)") |
| 19 | -set(CMAKE_INSTALL_DIR "lib/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") |
| 20 | -set(PKGCONFIG_INSTALL_DIR "lib/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") |
| 21 | +set(CMAKE_INSTALL_DIR "lib${LIB_SUFFIX}/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") |
| 22 | +set(PKGCONFIG_INSTALL_DIR "lib${LIB_SUFFIX}/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") |
| 23 | set(DOC_INSTALL_DIR "share/doc" CACHE PATH "The subdirectory to install documentation files (default: share/doc)") |
| 24 | set(prefix "${CMAKE_INSTALL_PREFIX}") |
| 25 | set(exec_prefix "${CMAKE_INSTALL_PREFIX}/bin") |
| 26 | -set(libdir "${CMAKE_INSTALL_PREFIX}/lib") |
| 27 | +set(libdir "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") |
| 28 | set(includedir "${CMAKE_INSTALL_PREFIX}/include") |
| 29 | set(cmakedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DIR}") |
| 30 | --- a/build/cmake/DefineCMakeDefaults.cmake |
| 31 | +++ b/build/cmake/DefineCMakeDefaults.cmake |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 32 | @@ -44,8 +44,8 @@ |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 33 | # top of the build tree rather than in hard-to-find leaf |
| 34 | # directories. This simplifies manual testing and the use of the build |
| 35 | # tree rather than installed thrift libraries. |
| 36 | -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) |
| 37 | -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) |
| 38 | +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) |
| 39 | +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) |
| 40 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) |
| 41 | |
| 42 | # |