blob: fba9a8767f7950932ffce45c38b23b91dd0028d1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 19 Mar 2022 23:37:58 -0700
Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR
This ensures the install paths are not hardcoded.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
---
cmake/CMakeLists.txt | 4 ++--
src/samples/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a9f8908..7eadc60 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -11,7 +11,7 @@ export(EXPORT ${package_name}
FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake"
NAMESPACE ${package_name}::)
-install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name}
+install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}
FILE ${package_name}Targets.cmake
NAMESPACE ${package_name}::)
@@ -19,4 +19,4 @@ install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
FindPahoMqttC.cmake
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
- DESTINATION lib/cmake/${package_name})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name})
diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
index 3ca0a75..c915cd5 100644
--- a/src/samples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt
@@ -71,7 +71,7 @@ endforeach()
## install binaries
install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples
- RUNTIME DESTINATION bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
## Build the SSL/TLS samples, if selected
@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL)
endforeach()
install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples
- RUNTIME DESTINATION bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
endif()
--
2.34.1
|
