diff options
-rw-r--r-- | meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch | 53 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb (renamed from meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb) | 6 |
2 files changed, 1 insertions, 58 deletions
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch deleted file mode 100644 index a881c83495..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 19 Mar 2022 23:37:58 -0700 | ||
4 | Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR | ||
5 | |||
6 | This ensures the install paths are not hardcoded. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | --- | ||
12 | cmake/CMakeLists.txt | 4 ++-- | ||
13 | src/samples/CMakeLists.txt | 4 ++-- | ||
14 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | --- a/cmake/CMakeLists.txt | ||
17 | +++ b/cmake/CMakeLists.txt | ||
18 | @@ -34,7 +34,7 @@ export(EXPORT ${package_name} | ||
19 | ) | ||
20 | |||
21 | install(EXPORT ${package_name} | ||
22 | - DESTINATION lib/cmake/${package_name} | ||
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} | ||
24 | FILE ${package_name}Targets.cmake | ||
25 | NAMESPACE ${package_name}:: | ||
26 | ) | ||
27 | @@ -42,5 +42,5 @@ install(EXPORT ${package_name} | ||
28 | install(FILES | ||
29 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" | ||
30 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" | ||
31 | - DESTINATION lib/cmake/${package_name} | ||
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} | ||
33 | ) | ||
34 | --- a/examples/CMakeLists.txt | ||
35 | +++ b/examples/CMakeLists.txt | ||
36 | @@ -65,7 +65,7 @@ endforeach() | ||
37 | |||
38 | ## install binaries | ||
39 | install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples | ||
40 | - RUNTIME DESTINATION bin | ||
41 | + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} | ||
42 | ) | ||
43 | |||
44 | ## Build the SSL/TLS samples, if selected | ||
45 | @@ -80,7 +80,7 @@ if(PAHO_WITH_SSL) | ||
46 | endforeach() | ||
47 | |||
48 | install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples | ||
49 | - RUNTIME DESTINATION bin | ||
50 | + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} | ||
51 | ) | ||
52 | endif() | ||
53 | |||
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb index 6f2efcda50..f4f01e69db 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb | |||
@@ -10,11 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ | 10 | file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI = "gitsm://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \ | 13 | SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master;tag=v${PV}" |
14 | file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ | ||
15 | " | ||
16 | SRCREV = "ac1b023eab789e829656144f12b248602c40e37b" | ||
17 | PV .= "+git" | ||
18 | 14 | ||
19 | DEPENDS = "openssl paho-mqtt-c" | 15 | DEPENDS = "openssl paho-mqtt-c" |
20 | 16 | ||