Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 19 Dec 2019 16:26:39 -0800 |
| 4 | Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path |
| 5 | |
| 6 | Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373] |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 8 | --- |
| 9 | CMakeLists.txt | 5 +++-- |
| 10 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 11 | |
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 13 | index 7073a0b..5236fd2 100644 |
| 14 | --- a/CMakeLists.txt |
| 15 | +++ b/CMakeLists.txt |
| 16 | @@ -120,17 +120,18 @@ endif() |
| 17 | configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in" |
| 18 | "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY) |
| 19 | |
| 20 | +include(GNUInstallDirs) |
| 21 | # These installs only make sense for a local project |
| 22 | if(CUR_PROJ) |
| 23 | # Make version available in the install |
| 24 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" |
| 25 | - DESTINATION lib/cmake/CLI11) |
| 26 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) |
| 27 | |
| 28 | # Install the export target as a file |
| 29 | install(EXPORT CLI11Targets |
| 30 | FILE CLI11Config.cmake |
| 31 | NAMESPACE CLI11:: |
| 32 | - DESTINATION lib/cmake/CLI11) |
| 33 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) |
| 34 | |
| 35 | # Use find_package on the installed package |
| 36 | export(TARGETS CLI11 |
| 37 | -- |
| 38 | 2.24.1 |
| 39 | |