| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 19 Dec 2019 21:33:46 -0800 |
| 4 | Subject: [PATCH] use GNUInstallDirs for detecting install paths |
| 5 | |
| 6 | This helps with multilib builds |
| 7 | |
| 8 | Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | sources/ade/CMakeLists.txt | 10 ++++++---- |
| 12 | 1 file changed, 6 insertions(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt |
| 15 | index 2d1dd20..46415d1 100644 |
| 16 | --- a/sources/ade/CMakeLists.txt |
| 17 | +++ b/sources/ade/CMakeLists.txt |
| 18 | @@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION) |
| 19 | VERBATIM) |
| 20 | endif() |
| 21 | |
| 22 | +include(GNUInstallDirs) |
| 23 | + |
| 24 | install(TARGETS ade COMPONENT dev |
| 25 | EXPORT adeTargets |
| 26 | - ARCHIVE DESTINATION lib |
| 27 | - LIBRARY DESTINATION lib |
| 28 | - RUNTIME DESTINATION lib |
| 29 | - INCLUDES DESTINATION include) |
| 30 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 31 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 32 | + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 33 | + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| 34 | |
| 35 | install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev) |
| 36 | |
| 37 | -- |
| 38 | 2.24.1 |
| 39 | |